diff --git a/Web/app.py b/Web/app.py
index 3a317c3..7e9eb9c 100755
--- a/Web/app.py
+++ b/Web/app.py
@@ -7905,66 +7905,69 @@ def terminplan():
 @app.route('/register', methods=['GET', 'POST'])
 def register():
     """
-    User registration route.false
+    User registration route.
     Returns:
         flask.Response: Rendered template or redirect
     """
     if 'username' not in session:
-        flash('Ihnen ist es nicht gestattet auf dieser Internetanwendung, die eben besuchte Adrrese zu nutzen, versuchen sie es erneut nach dem sie sich mit einem berechtigten Nutzer angemeldet haben!', 'error')
+        flash('Ihnen ist es nicht gestattet auf dieser Internetanwendung, die eben besuchte Adresse zu nutzen, versuchen Sie es erneut, nachdem Sie sich mit einem berechtigten Nutzer angemeldet haben!', 'error')
         return redirect(url_for('login'))
-    if 'username' in session:
-        if request.method == 'POST':
-            password = request.form['password']
-            name = (request.form.get('name') or '').strip()
-            last_name = (request.form.get('last-name') or '').strip()
+        
+    if request.method == 'POST':
+        password = request.form.get('password', '')
+        name = (request.form.get('name') or '').strip()
+        last_name = (request.form.get('last-name') or '').strip()
 
-            # Generate a username from the first 3 letters of first and last name.
-            username = us.build_unique_username_from_name(name, last_name)
+        username = us.build_unique_username_from_name(name, last_name)
+        
+        permission_preset = (request.form.get('permission_preset') or 'standard_user').strip()
+        use_custom_permissions = request.form.get('use_custom_permissions') == 'on'
+        
+        if not username or not password or not name or not last_name:
+            flash('Bitte füllen Sie alle Felder aus', 'error')
+            return redirect(url_for('register'))
             
-            permission_preset = (request.form.get('permission_preset') or 'standard_user').strip()
-            use_custom_permissions = request.form.get('use_custom_permissions') == 'on'
+        if not us.check_password_strength(password):
+            flash('Passwort ist zu schwach oder entspricht nicht den Richtlinien', 'error')
+            return redirect(url_for('register'))
+
+        action_permissions = None
+        page_permissions = None
+        if use_custom_permissions:
+            action_permissions = {}
+            for action_key, _ in PERMISSION_ACTION_OPTIONS:
+                action_permissions[action_key] = request.form.get(f'action_{action_key}') == 'on'
+
+            page_permissions = {}
+            for endpoint_name, _ in PERMISSION_PAGE_OPTIONS:
+                page_permissions[endpoint_name] = request.form.get(f'page_{endpoint_name}') == 'on'
             
-            if not username or not password or not name or not last_name:
-                flash('Bitte füllen Sie alle Felder aus', 'error')
-                return redirect(url_for('register'))
-            if not us.check_password_strength(password):
-                flash('Passwort ist zu schwach', 'error')
-                return redirect(url_for('register'))
-
-            action_permissions = None
-            page_permissions = None
-            if use_custom_permissions:
-                action_permissions = {}
-                for action_key, _ in PERMISSION_ACTION_OPTIONS:
-                    action_permissions[action_key] = request.form.get(f'action_{action_key}') == 'on'
-
-                page_permissions = {}
-                for endpoint_name, _ in PERMISSION_PAGE_OPTIONS:
-                    page_permissions[endpoint_name] = request.form.get(f'page_{endpoint_name}') == 'on'
-                
-            us.add_user(
-                username,
-                password,
-                name,
-                last_name,
-                is_student=False,
-                student_card_id=None,
-                max_borrow_days=None,
-                permission_preset=permission_preset,
-                action_permissions=action_permissions,
-                page_permissions=page_permissions,
-            )
-            return redirect(url_for('home_admin'))
-        return render_template(
-            'register.html',
-            library_module_enabled=cfg.MODULES.is_enabled('library'),
-            student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-            student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
-            student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS
+        us.add_user(
+            username,
+            password,
+            name,
+            last_name,
+            is_student=False,
+            student_card_id=None,
+            max_borrow_days=None,
+            permission_preset=permission_preset,
+            action_permissions=action_permissions,
+            page_permissions=page_permissions,
         )
-    flash('Sie sind nicht berechtigt, diese Seite anzuzeigen', 'error')
-    return redirect(url_for('login'))
+        
+        flash(f'Benutzer "{username}" wurde erfolgreich registriert!', 'success')
+        return redirect(url_for('home_admin'))
 
+    return render_template(
+        'register.html',
+        library_module_enabled=cfg.MODULES.is_enabled('library'),
+        student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
+        student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
+        student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
+        permission_presets=getattr(us, 'PERMISSION_PRESETS', {}),
+        permission_action_options=PERMISSION_ACTION_OPTIONS,
+        permission_page_options=PERMISSION_PAGE_OPTIONS
+    )
 
 @app.route('/user_del', methods=['GET'])
 def user_del():