diff --git a/seahub/settings.py b/seahub/settings.py
index bee5dd00cb..77b07d19d2 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -267,6 +267,11 @@ FORCE_SERVER_CRYPTO = True
 # Enable or disable repo history setting
 ENABLE_REPO_HISTORY_SETTING = True
 
+# Enable or disable org repo creation by user
+ENABLE_USER_CREATE_ORG_REPO = True
+
+DISABLE_SYNC_WITH_ANY_FOLDER = False
+
 # File preview
 FILE_PREVIEW_MAX_SIZE = 30 * 1024 * 1024
 OFFICE_PREVIEW_MAX_SIZE = 2 * 1024 * 1024
@@ -613,13 +618,13 @@ INNER_FILE_SERVER_ROOT = 'http://127.0.0.1:' + FILE_SERVER_PORT
 CONSTANCE_CONFIG = {
     'SERVICE_URL': (SERVICE_URL,''),
     'FILE_SERVER_ROOT': (FILE_SERVER_ROOT,''),
-    'DISABLE_SYNC_WITH_ANY_FOLDER': (False,''),
+    'DISABLE_SYNC_WITH_ANY_FOLDER': (DISABLE_SYNC_WITH_ANY_FOLDER,''),
 
     'ENABLE_SIGNUP': (ENABLE_SIGNUP,''),
     'ACTIVATE_AFTER_REGISTRATION': (ACTIVATE_AFTER_REGISTRATION,''),
     'REGISTRATION_SEND_MAIL': (REGISTRATION_SEND_MAIL ,''),
     'LOGIN_REMEMBER_DAYS': (LOGIN_REMEMBER_DAYS,''),
-    'ENABLE_ORGANIZATION_LIBRARY': (True, ''),
+    'ENABLE_USER_CREATE_ORG_REPO': (ENABLE_USER_CREATE_ORG_REPO, ''),
 
     'ENABLE_ENCRYPTED_LIBRARY': (ENABLE_ENCRYPTED_LIBRARY,''),
     'REPO_PASSWORD_MIN_LENGTH': (REPO_PASSWORD_MIN_LENGTH,''),
diff --git a/seahub/templates/sysadmin/settings.html b/seahub/templates/sysadmin/settings.html
index fdc82ef9e2..3e5e4040e3 100644
--- a/seahub/templates/sysadmin/settings.html
+++ b/seahub/templates/sysadmin/settings.html
@@ -69,10 +69,6 @@
         {% include "snippets/web_settings_form.html" %}
     {% endwith %}
 
-    {% with type="checkbox" setting_display_name="organization library" help_tip="Allow user to add organization library. If unchecked, only system admin can add library." setting_name="ENABLE_ORGANIZATION_LIBRARY" setting_val=config_dict.ENABLE_ORGANIZATION_LIBRARY %}
-        {% include "snippets/web_settings_form.html" %}
-    {% endwith %}
-        
     {% with type="input" setting_display_name="library password minimum length" help_tip="The least number of characters an encrypted library password should include." setting_name="REPO_PASSWORD_MIN_LENGTH" setting_val=config_dict.REPO_PASSWORD_MIN_LENGTH %}
         {% include "snippets/web_settings_form.html" %}
     {% endwith %}
@@ -83,6 +79,12 @@
     {% endwith %}
     </div>
 
+    <div>
+    {% with type="checkbox" setting_display_name="ENABLE_USER_CREATE_ORG_REPO" help_tip="Allow user to add organization library. If unchecked, only system admin can add library." setting_name="ENABLE_USER_CREATE_ORG_REPO" setting_val=config_dict.ENABLE_USER_CREATE_ORG_REPO %}
+        {% include "snippets/web_settings_form.html" %}
+    {% endwith %}
+    </div>
+
     <h4>Sync</h4>
 
     <div>
diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py
index f110fbdf65..34b9f2b3f8 100644
--- a/seahub/utils/__init__.py
+++ b/seahub/utils/__init__.py
@@ -1318,4 +1318,4 @@ def is_org_repo_creation_allowed(request):
     if request.user.is_staff:
         return True
     else:
-        return config.ENABLE_ORGANIZATION_LIBRARY
+        return config.ENABLE_USER_CREATE_ORG_REPO
diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
index 7c4741a946..da52201427 100644
--- a/seahub/views/sysadmin.py
+++ b/seahub/views/sysadmin.py
@@ -2150,7 +2150,7 @@ def sys_settings(request):
         'ENABLE_REPO_HISTORY_SETTING', 'USER_STRONG_PASSWORD_REQUIRED',
         'ENABLE_ENCRYPTED_LIBRARY', 'USER_PASSWORD_MIN_LENGTH',
         'USER_PASSWORD_STRENGTH_LEVEL', 'SHARE_LINK_PASSWORD_MIN_LENGTH',
-        'ENABLE_ORGANIZATION_LIBRARY'
+        'ENABLE_USER_CREATE_ORG_REPO'
     )
 
     STRING_WEB_SETTINGS = ('SERVICE_URL', 'FILE_SERVER_ROOT',)