diff --git a/ChangeLog.md b/ChangeLog.md
index e8491a064..923e51045 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,4 +1,16 @@
-  * Version 06.08.2016
+  * Version 18.09.2018
+
+    Tooltips funktionieren auch ohne JavaScript
+
+    Kurskürzel müssen nur innerhalb eines Instituts eindeutig sein
+
+    User Data zeigt nun alle momentan gespeicherten Datensätze an
+
+    Unterstützung von Tabellenzusammenfassungen, z.B. Punktsummen
+
+    Intelligente Verteilung von Abgaben auf Korrektoren (z.B. bei Krankheit)
+
+  * Version 06.08.2018
   
     Einführung einer Option, ob Dateien automatisch heruntergeladen werden sollen
 
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 388ff2372..5f78d7f56 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1216,10 +1216,11 @@ instance YesodAuth UniWorX where
               , userDownloadFiles  = userDefaultDownloadFiles
               , ..
               }
-            userUpdate = [ UserMatrikelnummer =. userMatrikelnummer
-                         , UserDisplayName =. userDisplayName
-                         , UserEmail =. userEmail
-                     ]
+            userUpdate =  [ UserMatrikelnummer =. userMatrikelnummer
+                          , UserDisplayName    =. userDisplayName
+                          , UserSurname        =. userSurname
+                          , UserEmail          =. userEmail
+                          ]
 
           userId <- lift $ entityKey <$> upsertBy uAuth newUser userUpdate
 
diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs
index ae6e07c64..ccedb3f71 100644
--- a/src/Handler/Users.hs
+++ b/src/Handler/Users.hs
@@ -33,9 +33,9 @@ getUsersR = do
   let
     dbtColonnade = dbColonnade . mconcat $
       [ dbRow
-      , sortable (Just "display-name") (i18nCell MsgName) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
+      , sortable (Just "name") (i18nCell MsgName) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
           (AdminUserR <$> encrypt uid)
-          (toWidget . display $ userDisplayName)
+          (nameWidget userDisplayName userSurname)
       , sortable (Just "matriculation") (i18nCell MsgMatrikelNr) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
           (AdminUserR <$> encrypt uid)
           (toWidget . display $ userMatrikelnummer)
@@ -73,22 +73,22 @@ getUsersR = do
           |]
       ]
     psValidator = def
-      & defaultSorting [("display-name", SortAsc)]
+      & defaultSorting [("name", SortAsc),("display-name", SortAsc)]
   
   ((), userList) <- dbTable psValidator $ DBTable
     { dbtSQLQuery  = return :: E.SqlExpr (Entity User) -> E.SqlQuery (E.SqlExpr (Entity User))
     , dbtColonnade
     , dbtProj      = return
     , dbtSorting   = Map.fromList
-        [ ( "display-name"
+        [ ( "name"
+          , SortColumn $ \user -> user E.^. UserSurname
+          )
+        , ( "display-name"
           , SortColumn $ \user -> user E.^. UserDisplayName
           )
         , ( "matriculation"
           , SortColumn $ \user -> user E.^. UserMatrikelnummer
           )
---         , ( "last-name"
---           , SortColumn $ \user -> (last . impureNonNull . words) <$> (user E.^. UserDisplayName)
---           )
         ]
     , dbtFilter    = mempty
     , dbtStyle     = def