diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index d66a730561b103da8b5bb32246362070d15c86b2..c91a48dd1d8e45dc6001610a84123d0b2d1c8563 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -393,15 +393,18 @@ class Admin_UserController extends AuthenticatedController
         if ($user_id === null) {
             if (Request::option('user')) {
                 $user_id = Request::option('user');
-            } else {
-                PageLayout::postInfo(_('Sie haben niemanden ausgewählt!'));
-                //liste wieder anzeigen
-                $this->redirect('admin/user/');
-                return;
             }
         }
 
         $this->user = User::find($user_id);
+
+        if (!$this->user) {
+            PageLayout::postInfo(_('Sie haben niemanden ausgewählt!'));
+            //liste wieder anzeigen
+            $this->redirect('admin/user/');
+            return;
+        }
+
         $this->user_roles = $this->user->getRoles();
 
         // Änderungen speichern