diff --git a/flaschengeist/controller/userController.py b/flaschengeist/controller/userController.py
index 0722d66..fff534c 100644
--- a/flaschengeist/controller/userController.py
+++ b/flaschengeist/controller/userController.py
@@ -76,8 +76,6 @@ def reset_password(token: str, password: str):
 @Hook
 def update_user(user):
     current_app.config["FG_AUTH_BACKEND"].update_user(user)
-    if not user.display_name:
-        user.display_name = "{} {}.".format(user.firstname, user.lastname[0])
     db.session.commit()
 
 
@@ -159,6 +157,8 @@ def find_user(uid_mail):
     else:
         user = current_app.config["FG_AUTH_BACKEND"].find_user(uid_mail, uid_mail if mail else None)
         if user:
+            if not user.display_name:
+                user.display_name = "{} {}.".format(user.firstname, user.lastname[0])
             db.session.add(user)
             db.session.commit()
     return user