diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js
index 3065067174..61a8420d3a 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js
@@ -329,7 +329,9 @@ export const formatModelAttributes = attributes =>
         if (
           ((curr.includes('max') || curr.includes('min')) && !value) ||
           curr === 'isVirtual' ||
-          (curr === 'dominant' && !value)
+          (curr === 'dominant' && !value) ||
+          (curr === 'columnName' && value === '') ||
+          (curr === 'targetColumnName' && value === '')
         ) {
           return acc2;
         }
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js
index 225fc32f3d..e03add45f4 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js
@@ -54,16 +54,16 @@ export function* submitCT({
       body.plugin = source;
     }
 
-    yield put(emitEvent('willSaveContentType'));
+    emitEvent('willSaveContentType');
 
     const opts = { method: 'PUT', body };
 
     yield call(request, requestURL, opts, true);
-    yield put(emitEvent('didSaveContentType'));
+    emitEvent('didSaveContentType');
     yield put(submitContentTypeSucceeded(oldContentTypeName));
 
     if (name !== oldContentTypeName) {
-      yield put(emitEvent('didEditNameOfContentType'));
+      emitEvent('didEditNameOfContentType');
 
       const appPlugins = plugins.toJS ? plugins.toJS() : plugins;
       const appMenu = get(appPlugins, ['content-manager', 'leftMenuSections'], []);
@@ -86,14 +86,14 @@ export function* submitCT({
 /* istanbul ignore-next */
 export function* submitTempCT({ body, context: { emitEvent, plugins, updatePlugin } }) {
   try {
-    yield put(emitEvent('willSaveContentType'));
+    emitEvent('willSaveContentType');
 
     const requestURL = `/${pluginId}/models`;
     const opts = { method: 'POST', body };
 
     yield call(request, requestURL, opts, true);
 
-    yield put(emitEvent('didSaveContentType'));
+    emitEvent('didSaveContentType');
     yield put(submitTempContentTypeSucceeded());
 
     const { name } = body;
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js
index ede61ef50a..2b4e3f2b0e 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js
@@ -140,7 +140,6 @@ describe('Content Type Builder Action utils', () => {
             pluginValue: 'users-permissions',
             plugin: true,
             configurable: false,
-            targetColumnName: '',
             target: 'role',
           },
         },
@@ -152,7 +151,6 @@ describe('Content Type Builder Action utils', () => {
             nature: 'manyToMany',
             pluginValue: 'users-permissions',
             plugin: true,
-            targetColumnName: '',
             target: 'role2',
           },
         },
@@ -740,7 +738,6 @@ describe('App actions', () => {
               pluginValue: 'users-permissions',
               plugin: true,
               configurable: false,
-              targetColumnName: '',
               target: 'role',
             },
           },
@@ -833,7 +830,6 @@ describe('App actions', () => {
               pluginValue: 'users-permissions',
               plugin: true,
               configurable: false,
-              targetColumnName: '',
               target: 'role',
             },
           },
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/supportedAttributes.json b/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/supportedAttributes.json
index 59e3b1c3e8..b8437349b5 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/supportedAttributes.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/supportedAttributes.json
@@ -359,7 +359,6 @@
           "type": "checkbox",
           "value": false,
           "validations": {
-            "required": true
           }
         }
       ]
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
index 8d942d5284..7c65e68eb9 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
@@ -266,7 +266,7 @@ export class ModelPage extends React.Component {
     } = this.props;
     const attributeType = ['integer', 'biginteger', 'float', 'decimal'].includes(type) ? 'number' : type;
 
-    if (canOpenModal) {
+    if (canOpenModal || this.isUpdatingTemporaryContentType()) {
       setTemporaryAttribute(attributeName, this.isUpdatingTemporaryContentType(), this.getModelName());
 
       await this.wait();
diff --git a/packages/strapi-plugin-users-permissions/models/Role.settings.json b/packages/strapi-plugin-users-permissions/models/Role.settings.json
index 7549710040..c1034c1980 100644
--- a/packages/strapi-plugin-users-permissions/models/Role.settings.json
+++ b/packages/strapi-plugin-users-permissions/models/Role.settings.json
@@ -30,8 +30,9 @@
     "users": {
       "collection": "user",
       "via": "role",
+      "configurable": false,
       "plugin": "users-permissions"
     }
   },
   "collectionName": "users-permissions_role"
-}
\ No newline at end of file
+}