diff --git a/ttadmin/users/forms.py b/ttadmin/users/forms.py
index b5ae3ea..df9c88c 100644
--- a/ttadmin/users/forms.py
+++ b/ttadmin/users/forms.py
@@ -12,9 +12,9 @@ submission_throttle = {}
 throttle_submission = throttler(submission_throttle)
 
 
-USERNAME_RE = re.compile(r'[a-z][a-z0-9_]+')
+USERNAME_RE = re.compile(r'^[a-z][a-z0-9_]+$')
 USERNAME_MIN_LENGTH = 3
-DISPLAY_NAME_RE = re.compile(r"[a-zA-Z0-9_\-']+")
+DISPLAY_NAME_RE = re.compile(r"^[a-zA-Z0-9_\-']+$")
 DISPLAY_MIN_LENGTH = 2
 
 
diff --git a/ttadmin/users/models.py b/ttadmin/users/models.py
index ca0713f..51abfe2 100644
--- a/ttadmin/users/models.py
+++ b/ttadmin/users/models.py
@@ -19,6 +19,7 @@ SSH_TYPE_CHOICES = (
     ('ssh-rsa', 'ssh-rsa',),
     ('ssh-dss', 'ssh-dss',),
     ('ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp256'),
+    ('ssh-ed25519', 'ssh-ed25519'),
 )
 
 DEFAULT_INDEX_PATH = '/etc/skel/public_html/index.html'