diff --git a/app.py b/app.py
index 5db79df..fa044d5 100644
--- a/app.py
+++ b/app.py
@@ -267,7 +267,7 @@ def profile_change():
     newName = request.form.get('newName')
     newEmail = request.form.get('newEmail')
     newPassword = request.form.get('newPassword')
-    password = request.form.get('password')
+    oldPassword = request.form.get('oldPassword')
 
     # Check for errors
     errors = {}
@@ -277,7 +277,7 @@ def profile_change():
     if not newEmail:
         errors['newEmail'] = 'Die E-Mail Adresse ist erforderlich.'
 
-    if not password:
+    if not oldPassword:
         errors['oldPassword'] = 'Du musst dein aktuelles Passwort angeben.'
     else:
         if hashlib.sha256(oldPassword.encode()).hexdigest() != current_user.password:
diff --git a/models/User.py b/models/User.py
index cf2b129..b33395c 100644
--- a/models/User.py
+++ b/models/User.py
@@ -26,7 +26,7 @@ class User(UserMixin):
         return User(user[0], user[1], user[2], user[3]) if user else None
 
     def update(self):
-        update_user(self.id, self.name, self.email)
+        update_user(self.id, self.name, self.email, self.password if self.password else None)
 
     def delete(self):
         delete_user(self.id)
diff --git a/templates/profile.html b/templates/profile.html
index 0c40708..e5f81e4 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -22,19 +22,19 @@
         </div>
     </div>
 
-    <div class="form-group mb-3">
+    <div class="form-group mb-5">
         <label for="newPassword">Neues Passwort:</label>
-        <input type="password" class="form-control {% if errors.get('newPassword') %} is-invalid {% endif %}" id="newPassword" name="newPassword">
+        <input type="text" class="form-control {% if errors.get('newPassword') %} is-invalid {% endif %}" id="newPassword" name="newPassword">
         <div class="invalid-feedback">
             {{ errors.get('newPassword', '') }}
         </div>
     </div>
 
     <div class="form-group mb-3">
-        <label for="password">Altes Passwort:</label>
-        <input type="password" class="form-control {% if errors.get('password') %} is-invalid {% endif %}" id="password" name="password">
+        <label for="oldPassword">Altes Passwort:</label>
+        <input type="password" class="form-control {% if errors.get('oldPassword') %} is-invalid {% endif %}" id="oldPassword" name="oldPassword">
         <div class="invalid-feedback">
-            {{ errors.get('password', '') }}
+            {{ errors.get('oldPassword', '') }}
         </div>
     </div>