diff --git a/src/app.php b/src/app.php
index 86dad5f242fae056960c6bd5806d9fbdc22ead2c..8cf86b880774bf77b2f532e39e5c4d6a5166d428 100644
--- a/src/app.php
+++ b/src/app.php
@@ -18,7 +18,6 @@ class DagoJek {
             $instance = new DagoJek();
         }
 
-        include_once 'model/User.php';
         $instance->includeAllController();
 
         return $instance;
@@ -54,6 +53,7 @@ class DagoJek {
 
     public function Start() {
         $base_url = $this->getCurrentUri();
+        $base_url = $this->trimIndexDotPHP($base_url);
         if (array_key_exists ($base_url, $this->routingTable)) {
             $this->routingTable[$base_url]();
         } else {
@@ -61,5 +61,16 @@ class DagoJek {
             die ("404 Page not Found");
         }
     }
+
+    private function trimIndexDotPHP($string) {
+        $unnecessaryChars = "/index.php";
+
+        if (strpos($string, $unnecessaryChars) === 0) {
+            $result = substr($string, strlen($unnecessaryChars));
+            return $result;
+        } else {
+            return $string;
+        }
+    }
     
 }
diff --git a/src/route.php b/src/route.php
index 07fb8323f363bacf36d2b02172879881a6e74639..3c7f12ac5b2db3893e325cda1a46520cd308bca4 100644
--- a/src/route.php
+++ b/src/route.php
@@ -6,7 +6,10 @@ $AppInstance = Dagojek::Instance();
 
 $AppInstance->addRoute("/",                     'MainController::LoginHandler');
 $AppInstance->addRoute("/login",                'MainController::LoginHandler');
-$AppInstance->addRoute("/register",             'MainController::DefaultHandler');
+
+$AppInstance->addRoute("/register",             'RegisterController::RegisterHandler');
+$AppInstance->addRoute("/register/validate/username",'RegisterController::UsernameValidationHandler');
+$AppInstance->addRoute("/register/validate/email",'RegisterController::EmailValidationHandler');
 
 $AppInstance->addRoute("/main/profil",          'ProfilController::ProfilHandler');
 $AppInstance->addRoute("/main/profil/edit",     'ProfilController::EditHandler');