diff --git a/zerver/models.py b/zerver/models.py
index 9b54f33715..559c02e081 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -143,7 +143,7 @@ def email_to_domain(email):
 
 def remote_user_to_email(remote_user):
     if settings.SSO_APPEND_DOMAIN is not None:
-        remote_user += "@" + SSO_APPEND_DOMAIN
+        remote_user += "@" + settings.SSO_APPEND_DOMAIN
     return remote_user
 
 class RealmEmoji(models.Model):
diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py
index f13e172bc3..17b73e8fa6 100644
--- a/zerver/views/__init__.py
+++ b/zerver/views/__init__.py
@@ -23,7 +23,7 @@ from zerver.models import Message, UserProfile, Stream, Subscription, \
     get_recipient, valid_stream_name, to_dict_cache_key_id, \
     extract_message_dict, stringify_message_dict, parse_usermessage_flags, \
     email_to_domain, email_to_username, get_realm, completely_open, \
-    is_super_user, AppleDeviceToken, get_active_user_dicts_in_realm
+    is_super_user, AppleDeviceToken, get_active_user_dicts_in_realm, remote_user_to_email
 from zerver.lib.actions import bulk_remove_subscriptions, \
     do_change_password, create_mirror_user_if_needed, compute_irc_user_fullname, \
     compute_jabber_user_fullname, do_change_full_name, \
@@ -475,7 +475,7 @@ def maybe_send_to_registration(request, email, full_name=''):
 def remote_user_sso(request):
     try:
         remote_user = request.META["REMOTE_USER"]
-    except KeyError as e:
+    except KeyError:
         raise JsonableError("No REMOTE_USER set.")
 
     user = authenticate(remote_user=remote_user)