diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 038bc24..e78eb42 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -16,13 +16,10 @@ use Symfony\Component\Routing\Annotation\Route;
 class UserController extends AbstractController
 {
 
-    #[Route('/create', name: 'create', defaults: ['id' => null])]
-    #[Route('/{id}/edit', name: 'edit', requirements: ['id' => '\d+'])]
+    #[Route('/create', name: 'create', defaults: ['user' => new User()])]
+    #[Route('/{user}/edit', name: 'edit')]
     public function editAction(DocumentManager $dm, Request $request, User $user)
     {
-        if ($user == null)
-            $user = new User();
-
         $form = $this->createForm(UserType::class, $user);
 
         $form->handleRequest($request);
@@ -44,7 +41,7 @@ class UserController extends AbstractController
     #[Route('/login', name: 'login')]
     public function login(AuthenticationUtils $authenticationUtils): Response
     {
-        return $this->render('auth/login.html.twig', [
+        return $this->render('login.html.twig', [
             'last_username' => $authenticationUtils->getLastUsername(),
             'error' => $authenticationUtils->getLastAuthenticationError(),
         ]);