diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php
new file mode 100644
index 0000000..76d98f3
--- /dev/null
+++ b/app/controllers/UserController.php
@@ -0,0 +1,34 @@
+<?php
+
+use Form\UserSettings as UserSettingsForm;
+
+class UserController extends ControllerBase
+{
+    public function settingsAction()
+    {
+        $user = $this->_getAuth()->getUser();
+
+        $form = new UserSettingsForm($user);
+
+        if ($this->request->isPost()) {
+            $data = $this->request->getPost();
+
+            if ($form->isValid($data)) {
+
+                $new_pw = $form->getValue('passwordNew');
+                if (strlen($new_pw) > 0) {
+                    $hash = password_hash($new_pw, PASSWORD_BCRYPT);
+                    $user->setPassword($hash);
+                }
+                $user->save();
+                $form->initialize();
+
+                $this->flash->message('success', 'Settings saved!');
+            } else {
+                $this->flash->message('error', 'Could not save settings');
+            }
+        }
+
+        $this->view->form = $form;
+    }
+}