diff --git a/app/page/ManageUsers.php b/app/page/ManageUsers.php
index 07f1300..2034ce1 100644
--- a/app/page/ManageUsers.php
+++ b/app/page/ManageUsers.php
@@ -38,11 +38,10 @@ class ManageUsers extends RequestHandler
         $tpl = $this->app->template('users.php')->parent('__dashboard.php')->vars([
             'title' => 'Benutzer',
             'username' => $_SESSION['DISPLAYNAME']
-            ])->unsafeVar('user-list', $table.'</tbody></table>')
-            ->unsafeVar('users-message', isset($_SESSION['users-message']) ? $_SESSION['users-message'] : '');
+            ])->unsafeVar('user-list', $table.'</tbody></table>');
 
         if (isset($_SESSION['users-message'])) {
-            $tpl->unsafeVar('users-message', $_SESSION['users-message']);
+            $tpl->unsafeVar('message', $_SESSION['users-message']);
             unset($_SESSION['users-message']);
         }
 
diff --git a/app/page/ResetPassword.php b/app/page/ResetPassword.php
index fff32cf..b030874 100644
--- a/app/page/ResetPassword.php
+++ b/app/page/ResetPassword.php
@@ -81,7 +81,7 @@ class ResetPassword extends \Mcp\RequestHandler
                 'title' => 'Passwort geändert',
                 'preheader' => 'Das Passwort für deinen 4Creative-Account wurde soeben zurückgesetzt'
             ])->unsafeVar('message', str_replace('%%NAME%%', $name, $this::MESSAGE));
-            (new SmtpClient($smtp['host'], $smtp['port'], $smtp['address'], $smtp['password']))->sendHtml($smtp['address'], $smtp['name'], $res['Email'], 'Passwort für '.$name.' zurückgesetzt', $tplMail);
+            (new SmtpClient($smtp['host'], intval($smtp['port']), $smtp['address'], $smtp['password']))->sendHtml($smtp['address'], $smtp['name'], $res['Email'], 'Passwort für '.$name.' zurückgesetzt', $tplMail);
 
             header('Location: index.php?page=login');
         }
@@ -91,7 +91,7 @@ class ResetPassword extends \Mcp\RequestHandler
     {
         $this->app->template('error.php')->parent('__presession.php')->vars([
             'title' => 'Fehler',
-            'message' => $message
+            'error-message' => $message
         ])->render();
     }