diff --git a/create_account.py b/create_account.py
index 4781435993da6f32ef94ae42922ca5b6e79332ac..b316cd0bca978d77f27a51ea067a3634c675049b 100755
--- a/create_account.py
+++ b/create_account.py
@@ -3,14 +3,22 @@ import sys
 import rc_util
 
 if len(sys.argv) < 2:
-    print("Usage: {} USERNAME [FULL_NAME] [REASON]".format(sys.argv[0]), file=sys.stderr)
+    print("Usage: {} USERNAME [EMAIL] [FULL_NAME] [REASON]".format(sys.argv[0]), file=sys.stderr)
     exit(1)
 
+domain = 'uab.edu'
 user_name = sys.argv[1]
-full_name = sys.argv[2] if len(sys.argv) >= 3 else ''
-reason    = sys.argv[3] if len(sys.argv) >= 4 else ''
+email = sys.argv[2] if len(sys.argv) >= 3 else ''
+full_name = sys.argv[3] if len(sys.argv) >= 4 else ''
+reason    = sys.argv[4] if len(sys.argv) >= 5 else ''
 
-rc_util.add_account(user_name, full=full_name, reason=reason)
+if email == '':
+    if '@' in user_name:
+        email = user_name
+    else:
+        email = user_name + '@' + domain
+
+rc_util.add_account(user_name, email=email, full=full_name, reason=reason)
 print("Account requested for user: {}".format(user_name))
 
 print("Waiting for confirmation...")