diff --git a/login.php b/login.php
index fc4a4c2..0bc4d0e 100644
--- a/login.php
+++ b/login.php
@@ -4,18 +4,18 @@ $pdo = new PDO('mysql:host=localhost;dbname=usertable', 'usertable', 'password')
  
 if(isset($_GET['login'])) {
     $email = $_POST['email'];
-    $passwort = $_POST['passwort'];
+    $password = $_POST['password'];
     
     $statement = $pdo->prepare("SELECT * FROM users WHERE email = :email");
     $result = $statement->execute(array('email' => $email));
     $user = $statement->fetch();
         
     //Überprüfung des Passworts
-    if ($user !== false && password_verify($passwort, $user['passwort'])) {
+    if ($user !== false && password_verify($password, $user['password'])) {
         $_SESSION['userid'] = $user['id'];
         $_SESSION['email'] = $user['email'];
-        $_SESSION['givenName'] = $user['vorname'];
-        $_SESSION['lastName'] = $user['nachname'];
+        $_SESSION['givenName'] = $user['givenName'];
+        $_SESSION['lastName'] = $user['lastName'];
         die('successfull. go to: <a href="secure.php">secure page</a>');
     } else {
         $errorMessage = "somethings wrong (maybe wrong password or wrong email)<br>";
@@ -41,7 +41,7 @@ E-Mail:<br>
 <input type="email" size="40" maxlength="250" name="email"><br><br>
  
 Your password:<br>
-<input type="password" size="40" name="passwort"><br>
+<input type="password" size="40" name="password"><br>
  
 <input type="submit" value="GO">
 </form> 
diff --git a/register.php b/register.php
index 5817465..8530fd0 100644
--- a/register.php
+++ b/register.php
@@ -17,18 +17,18 @@ if(isset($_GET['register'])) {
     $email = $_POST['email'];
     $givenName = $_POST['givenName'];
     $lastName = $_POST['lastName'];
-    $passwort = $_POST['passwort'];
-    $passwort_confirm = $_POST['passwort_confirm'];
+    $password = $_POST['password'];
+    $password_confirm = $_POST['password_confirm'];
   
     if(!filter_var($email, FILTER_VALIDATE_EMAIL)) {
         echo 'Please use valid email<br>';
         $error = true;
     }     
-    if(strlen($passwort) == 0) {
+    if(strlen($password) == 0) {
         echo 'Please enter password<br>';
         $error = true;
     }
-    if($passwort != $passwort_confirm) {
+    if($password != $password_confirm) {
         echo 'passwords doesnt match<br>';
         $error = true;
     }
@@ -46,10 +46,10 @@ if(isset($_GET['register'])) {
     }
 
     if(!$error) {    
-        $passwort_hash = password_hash($passwort, PASSWORD_DEFAULT);
+        $password_hash = password_hash($password, PASSWORD_DEFAULT);
         
-        $statement = $pdo->prepare("INSERT INTO users (email, vorname, nachname, passwort) VALUES (:email, :givenName, :lastName, :passwort)");
-        $result = $statement->execute(array('email' => $email, 'givenName' => $givenName, 'lastName' => $lastName, 'passwort' => $passwort_hash));
+        $statement = $pdo->prepare("INSERT INTO users (email, givenName, lastName, password) VALUES (:email, :givenName, :lastName, :password)");
+        $result = $statement->execute(array('email' => $email, 'givenName' => $givenName, 'lastName' => $lastName, 'password' => $password_hash));
         
         if($result) {        
             echo 'successfull registered. <a href="login.php">Login</a>';
@@ -71,10 +71,10 @@ Given Name:<br>
 Family Name:<br>
 <input type="text" size="40" name="lastName"><br><br>
 Password:<br>
-<input type="password" size="40"  name="passwort"><br>
+<input type="password" size="40"  name="password"><br>
  
 Password (aganin):<br>
-<input type="password" size="40" name="passwort_confirm"><br><br>
+<input type="password" size="40" name="password_confirm"><br><br>
  
 <input type="submit" value="GO">
 </form>
diff --git a/usertable.sql b/usertable.sql
index 46b7669..62b44d3 100644
--- a/usertable.sql
+++ b/usertable.sql
@@ -1,10 +1,11 @@
 CREATE TABLE `users` ( 
   `id` INT NOT NULL AUTO_INCREMENT ,
   `email` VARCHAR(255) NOT NULL ,
-  `passwort` VARCHAR(255) NOT NULL ,
-  `vorname` VARCHAR(255) NOT NULL DEFAULT '' ,
-  `nachname` VARCHAR(255) NOT NULL DEFAULT '' ,
+  `username` VARCHAR(255) NOT NULL ,
+  `password` VARCHAR(255) NOT NULL ,
+  `givenName` VARCHAR(255) NOT NULL DEFAULT '' ,
+  `lastName` VARCHAR(255) NOT NULL DEFAULT '' ,
   `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ,
   `updated_at` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ,
-  PRIMARY KEY (`id`), UNIQUE (`email`)
+  PRIMARY KEY (`id`), UNIQUE (`email`), UNIQUE (`username`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file