diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs
index 0e66a50fe..fcfc1ef15 100644
--- a/src/Handler/Users.hs
+++ b/src/Handler/Users.hs
@@ -78,9 +78,13 @@ postUsersR = do
       , sortable (Just "name") (i18nCell MsgName) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
           (AdminUserR <$> encrypt uid)
           (nameWidget userDisplayName userSurname)
-      , sortable (Just "matriculation") (i18nCell MsgTableMatrikelNr) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
+--      , sortable (Just "matriculation") (i18nCell MsgTableMatrikelNr) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
+--          (AdminUserR <$> encrypt uid)
+--          (toWgt userMatrikelnummer)
+      , sortable (Just "personal-number") (i18nCell MsgCompanyPersonalNumber) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
           (AdminUserR <$> encrypt uid)
-          (toWgt userMatrikelnummer)
+          (toWgt userCompanyPersonalNumber)
+      , sortable (Just "company-department") (i18nCell MsgCompanyDepartment) $ \DBRow{ dbrOutput = Entity _uid User{..} } -> cellMaybe textCell userCompanyDepartment
 --       , sortable (Just "last-name") (i18nCell MsgName) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
 --           (AdminUserR <$> encrypt uid)
 --           (toWidget . display $ last $ impureNonNull $ words $ userDisplayName)
@@ -151,8 +155,11 @@ postUsersR = do
           , ( "display-name"
             , SortColumn $ \user -> user E.^. UserDisplayName
             )
-          , ( "matriculation"
-            , SortColumn $ \user -> user E.^. UserMatrikelnummer
+          , ( "personal-number"
+            , SortColumn $ \user -> user E.^. UserCompanyPersonalNumber
+            )
+          , ( "company-department"
+            , SortColumn $ \user -> user E.^. UserCompanyDepartment
             )
           , ( "auth-ldap"
             , SortColumn $ \user -> user E.^. UserAuthentication E.!=. E.val AuthLDAP
@@ -175,10 +182,18 @@ postUsersR = do
               Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
               Just needle -> (E.castString (user E.^. UserEmail) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))
                       E.||. (E.castString (user E.^. UserDisplayEmail) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))   
-)
-          , ( "matriculation", FilterColumn $ \user (criteria :: Set.Set Text) -> if
+            )
+--          , ( "matriculation", FilterColumn $ \user (criteria :: Set.Set Text) -> if
+--                 | Set.null criteria -> E.true -- TODO: why can this be eFalse and work still?
+--                 | otherwise         -> E.any (\c -> user E.^. UserMatrikelnummer `E.hasInfix` E.val c) criteria
+--            )
+          , ( "personal-number", FilterColumn $ \user (criteria :: Set.Set Text) -> if
                  | Set.null criteria -> E.true -- TODO: why can this be eFalse and work still?
-                 | otherwise         -> E.any (\c -> user E.^. UserMatrikelnummer `E.hasInfix` E.val c) criteria
+                 | otherwise         -> E.any (\c -> user E.^. UserCompanyPersonalNumber `E.hasInfix` E.val c) criteria
+            )
+          , ( "company-department", FilterColumn $ \user (criteria :: Set.Set Text) -> if
+                 | Set.null criteria -> E.true -- TODO: why can this be eFalse and work still?
+                 | otherwise         -> E.any (\c -> user E.^. UserCompanyDepartment `E.hasInfix` E.val c) criteria
             )
           , ( "auth-ldap", FilterColumn $ \user (criterion :: Last Bool) -> if
                 | Just crit <- getLast criterion
@@ -202,9 +217,10 @@ postUsersR = do
       , dbtFilterUI  = \mPrev -> mconcat
           [ prismAForm (singletonFilter "user-search") mPrev $ aopt textField  (fslI MsgName)
           , prismAForm (singletonFilter "user-ident") mPrev $ aopt textField  (fslI MsgAdminUserIdent)
-          , prismAForm (singletonFilter "user-email") mPrev $ aopt textField (fslI MsgAdminUserEmail)
-          -- , prismAForm (singletonFilter "matriculation" ) mPrev $ aopt textField (fslI MsgTableMatrikelNr)
-          , prismAForm (singletonFilter "matriculation") mPrev $ aopt matriculationField  (fslI MsgTableMatrikelNr)
+          , prismAForm (singletonFilter "user-email") mPrev $ aopt textField (fslI MsgAdminUserEmail)          
+          -- , prismAForm (singletonFilter "matriculation") mPrev $ aopt matriculationField  (fslI MsgTableMatrikelNr)
+          , prismAForm (singletonFilter "personal-number" ) mPrev $ aopt textField (fslI MsgCompanyPersonalNumber)
+          , prismAForm (singletonFilter "company-department" ) mPrev $ aopt textField (fslI MsgCompanyDepartment)
           , prismAForm (singletonFilter "auth-ldap" . maybePrism _PathPiece) mPrev $ aopt (lift `hoistField` selectFieldList [(MsgAuthPWHash "", False), (MsgAuthLDAP, True)]) (fslI MsgAuthMode)
           , prismAForm (singletonFilter "school") mPrev $ aopt (lift `hoistField` selectFieldList schoolOptions) (fslI MsgCourseSchool)
           , prismAForm (singletonFilter "ldap-sync" . maybePrism _PathPiece) mPrev $ aopt utcTimeField (fslI MsgLdapSyncedBefore)