diff --git a/atst/domain/auth.py b/atst/domain/auth.py
index 7d1f4aa7..cc3b1a60 100644
--- a/atst/domain/auth.py
+++ b/atst/domain/auth.py
@@ -10,7 +10,7 @@ def login_required(f):
     def decorated_function(*args, **kwargs):
         user = get_current_user()
         if user:
-            g.user = user
+            g.current_user = user
             return f(*args, **kwargs)
 
         else:
diff --git a/atst/routes/dev.py b/atst/routes/dev.py
index f50ff4ca..d6a260d1 100644
--- a/atst/routes/dev.py
+++ b/atst/routes/dev.py
@@ -49,11 +49,12 @@ _DEV_USERS = {
 def login_dev():
     role = request.args.get("username", "amanda")
     user_data = _DEV_USERS[role]
-    user = _set_user_permissions(user_data["dod_id"], user_data["atat_role"])
+    basic_data = {k:v for k,v in user_data.items() if k not in ["dod_id", "atat_role"]}
+    user = _set_user_permissions(user_data["dod_id"], user_data["atat_role"], basic_data)
     session["user_id"] = user.id
     app.logger.warning(session)
     return redirect(url_for("atst.home"))
 
 
-def _set_user_permissions(dod_id, role):
-    return Users.get_or_create_by_dod_id(dod_id, atat_role_name=role)
+def _set_user_permissions(dod_id, role, user_data):
+    return Users.get_or_create_by_dod_id(dod_id, atat_role_name=role, **user_data)
diff --git a/tests/mocks.py b/tests/mocks.py
index c39e6de6..aa6a9ab1 100644
--- a/tests/mocks.py
+++ b/tests/mocks.py
@@ -10,6 +10,7 @@ MOCK_USER = {
     "email": "fake.user@mail.com",
     "first_name": "Fake",
     "last_name": "User",
+    "atat_permissions": []
 }
 MOCK_REQUEST = RequestFactory.create(
     creator=MOCK_USER["id"],