diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 17c48f6213..1f47fe47e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -78,7 +78,7 @@ internal class DefaultSpaceService @Inject constructor(
             if (isPublic) {
                 this.roomAliasName = roomAliasLocalPart
                 this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy(
-                        invite = if (isPublic) 0 else Role.Moderator.value
+                        invite = if (isPublic) Role.Default.value else Role.Moderator.value
                 )
                 this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
                 this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/EditablePermission.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/EditablePermission.kt
index aee6ee2ca9..b083209f16 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/EditablePermission.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/EditablePermission.kt
@@ -77,6 +77,7 @@ sealed class EditablePermission(@StringRes val labelResId: Int, @StringRes val s
 
     class UpgradeTheRoom : EventTypeEditablePermission(
             EventType.STATE_ROOM_TOMBSTONE,
+            R.string.room_permissions_upgrade_the_room,
             R.string.room_permissions_upgrade_the_space
     )
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
index e44127b3cf..f6f168c365 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
@@ -75,7 +75,7 @@ class CreateSpaceViewModelTask @Inject constructor(
                 if (params.isPublic) {
                     this.roomAliasName = params.spaceAlias
                     this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy(
-                            invite = 0
+                            invite = Role.Default.value
                     )
                     this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
                     this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
index 63bafc1c33..411c987776 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
@@ -48,16 +48,16 @@ class SpaceManageSharedViewModel @AssistedInject constructor(
 
     override fun handle(action: SpaceManagedSharedAction) {
         when (action) {
-            SpaceManagedSharedAction.HandleBack -> {
+            SpaceManagedSharedAction.HandleBack                  -> {
                 // for now finish
                 _viewEvents.post(SpaceManagedSharedViewEvents.Finish)
             }
-            SpaceManagedSharedAction.HideLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.HideLoading)
-            SpaceManagedSharedAction.ShowLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.ShowLoading)
-            SpaceManagedSharedAction.CreateRoom ->  _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToCreateRoom)
-            SpaceManagedSharedAction.ManageRooms -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToManageRooms)
-            SpaceManagedSharedAction.OpenSpaceAliasesSettings -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToAliasSettings)
-            SpaceManagedSharedAction.OpenRoomPermissionSettings -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToPermissionSettings)
+            SpaceManagedSharedAction.HideLoading                 -> _viewEvents.post(SpaceManagedSharedViewEvents.HideLoading)
+            SpaceManagedSharedAction.ShowLoading                 -> _viewEvents.post(SpaceManagedSharedViewEvents.ShowLoading)
+            SpaceManagedSharedAction.CreateRoom                  -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToCreateRoom)
+            SpaceManagedSharedAction.ManageRooms                 -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToManageRooms)
+            SpaceManagedSharedAction.OpenSpaceAliasesSettings    -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToAliasSettings)
+            SpaceManagedSharedAction.OpenSpacePermissionSettings -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToPermissionSettings)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
index b89fcb261a..07c305e3eb 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
@@ -25,5 +25,5 @@ sealed class SpaceManagedSharedAction : VectorViewModelAction {
     object CreateRoom : SpaceManagedSharedAction()
     object ManageRooms : SpaceManagedSharedAction()
     object OpenSpaceAliasesSettings : SpaceManagedSharedAction()
-    object OpenRoomPermissionSettings : SpaceManagedSharedAction()
+    object OpenSpacePermissionSettings : SpaceManagedSharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
index 04e258ba80..8519f1d489 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
@@ -238,7 +238,7 @@ class SpaceSettingsFragment @Inject constructor(
     }
 
     override fun onRoomPermissionsClicked() {
-        sharedViewModel.handle(SpaceManagedSharedAction.OpenRoomPermissionSettings)
+        sharedViewModel.handle(SpaceManagedSharedAction.OpenSpacePermissionSettings)
     }
 
     override fun onImageReady(uri: Uri?) {