diff --git a/ssoauth/app_settings/__init__.py b/ssoauth/app_settings/__init__.py
index f6c7bdcc072eb1e470467a0e475da0d29b47eb66..7381b964944d39b4a610810a5914acb51d83b863 100644
--- a/ssoauth/app_settings/__init__.py
+++ b/ssoauth/app_settings/__init__.py
@@ -9,12 +9,11 @@ from .defaults import *
 # merge defaults with customized user settings
 
 for setting_name in [k for k in globals().keys() if k.isupper()]:
-        for name in ["SSOAUTH_" + setting_name, setting_name]:
-            try:
-                globals()[setting_name] = getattr(conf.settings, name)
-                continue
-            except (KeyError, AttributeError):
-                pass  # not set
+    for name in [setting_name, "SSOAUTH_" + setting_name]:
+        try:
+            globals()[setting_name] = getattr(conf.settings, name)
+        except (KeyError, AttributeError):
+            pass  # not set
 
 
 # template for OneLogin toolkit settings
diff --git a/ssoauth/app_settings/defaults.py b/ssoauth/app_settings/defaults.py
index 733a7d9f2f9710eb6064912a70bd909267fcd6aa..e8e98d88d2d1b63ef88e701347d477c49a2569db 100644
--- a/ssoauth/app_settings/defaults.py
+++ b/ssoauth/app_settings/defaults.py
@@ -3,12 +3,9 @@ from django.conf import settings as django_settings
 
 
 """
-Changing settings in Django:
-  - put the setting it into your project settings
+Changing settings:
+  - put the setting it into your django project settings
   - optionally prefix the setting with "SSOAUTH_"
-Changing settings outside of Django:
-  - import ssoauth.app_settings
-  - ssoauth.app_settings.SETTING_NAME = "your new value"
 """