diff --git a/src/main/java/org/s4s/dao/impl/RegistrationControl.java b/src/main/java/org/s4s/dao/impl/RegistrationControl.java
index aaf067cddac463547504ff5f689924fd36cb3380..8c4942edebdf85e01274f3582412b9139856e6bc 100644
--- a/src/main/java/org/s4s/dao/impl/RegistrationControl.java
+++ b/src/main/java/org/s4s/dao/impl/RegistrationControl.java
@@ -37,20 +37,23 @@ public class RegistrationControl {
         email = data[2];
         passwort = data[4];
         
-<<<<<<< HEAD
-        if (!nameValidator(nachname)) {
-=======
+        if(!(passwort.equals(data[5]) || email.equals(data[3]))) {
+            return false;
+        }
         
-        if (!nameValidator(surname)) {
->>>>>>> b9c731060515564cb15c225cca74afba8238a690
+        if (!nameValidator(nachname)) {
             return false;
         }
+        
         if (!nameValidator(vorname)) {
             return false;
         }
+        
         if (!emailValidator()) {
             return false;
-        } if (!passwordValidator()) {
+        }
+        
+        if (!passwordValidator()) {
             return false;
         }
         
@@ -69,14 +72,9 @@ public class RegistrationControl {
             con = DriverManager.getConnection(url);
             st = con.createStatement();
             
-            //wie wird die UserID vergeben?
-            //benutzername soll was sein? Vorname und Nachname?
-            //fachbereich muss noch in View hinzugefügt werden
-            //adresse am besten in der DB in User hinterlegen
-            sql_update = "INSERT INTO \"ERR\".\"user\"()"
-                        + ""; //erweitern
-            //INSERT INTO user(userID, email, passwort, nachname, vorname) 
-            //VALUES(sq.generator.nextval, email, passwort, nachname, vorname);
+            
+            sql_update = "INSERT INTO \"ERR\".\"user\"(email, passwort, nachname, vorname)" +
+                          "VALUES(email, passwort, nachname, vorname)"; //erweitern
             
             st.executeUpdate(sql_update);