diff --git a/Handler/Home.hs b/Handler/Home.hs
index 288f1e7..b0d3f93 100644
--- a/Handler/Home.hs
+++ b/Handler/Home.hs
@@ -47,18 +47,27 @@ getHomeR = do
 postHomeR :: Handler Html
 postHomeR = do
     ((result, loginWidget), loginEnctype) <- runFormPost loginForm
-    defaultLayout $ do
+    let loginfail err = defaultLayout $ do
         setTitle "NEAT"
         [whamlet|
             <h1>
                 Welcome to NEAT.
             <div>
+                <div class="alert alert-danger fade in">#{err}
                 Login
                 <form method=post action=@{HomeR} enctype=#{loginEnctype}>
                     ^{loginWidget}
                     <button>Submit
                <a href=@{RegisterR}>Register Account
         |]
+    case result of 
+      FormSuccess (u,pw) -> do
+                       login <- runDB $ selectFirst [UserIdent ==. u, UserPassword ==. (Just pw)] []
+                       case login of
+                         Nothing -> loginfail ("wrong username or password" :: Text)
+                         Just (Entity _ (User name _ _)) ->
+                                defaultLayout $ do [whamlet|<h1>Hello #{name}|]
+      _ -> loginfail ("wrong username or password" :: Text)
 
 
 sampleForm :: Form (FileInfo, Text)
diff --git a/Handler/Register.hs b/Handler/Register.hs
index 3e99911..fb470f6 100644
--- a/Handler/Register.hs
+++ b/Handler/Register.hs
@@ -2,7 +2,7 @@ module Handler.Register where
 
 import Import
 import Yesod.Form.Bootstrap3
-import Yesod.Form.Functions
+import Handler.Home (getHomeR)
 
 getRegisterR :: Handler Html
 getRegisterR = do
@@ -18,16 +18,20 @@ getRegisterR = do
 postRegisterR :: Handler Html
 postRegisterR = do
                 ((result,registerWidget), registerEnctype) <- runFormPost registerForm
-                let again error = defaultLayout $ do
+                let again err = defaultLayout $ do
                         setTitle "Register"
                         [whamlet|
-                        <div class="alert alert-danger fade in"><strong>Error:</strong> #{error}
+                        <div class="alert alert-danger fade in"><strong>Error:</strong> #{err}
                         <h1>Register
                         <form method=post action=@{RegisterR} enctype=#{registerEnctype}>
                           ^{registerWidget}
                   |]
                 case result of
-                  FormSuccess a -> defaultLayout $ [whamlet|<h1> success|]
+                  FormSuccess (user,mail) -> do
+                        _ <- runDB $ do
+                            uid <- insert user
+                            insert $ Email mail uid Nothing
+                        getHomeR
                   FormFailure (err:_) -> again err
                   _ -> again "Invalid input"
 
diff --git a/config/models b/config/models
index c611886..4a5d4dc 100644
--- a/config/models
+++ b/config/models
@@ -7,7 +7,7 @@ User
 
 Email
     email Text
-    user UserId Maybe
+    user UserId
     verkey Text Maybe
     UniqueEmail email
 
diff --git a/neat.cabal b/neat.cabal
index 8cde638..1b74ade 100644
--- a/neat.cabal
+++ b/neat.cabal
@@ -52,6 +52,7 @@ library
                  , yesod                         >= 1.4.1      && < 1.5
                  , yesod-core                    >= 1.4.6      && < 1.5
                  , yesod-auth                    >= 1.4.0      && < 1.5
+                 , yesod-persistent              >= 1.4.0      && < 1.5
                  , yesod-static                  >= 1.4.0.3    && < 1.5
                  , yesod-form                    >= 1.4.0      && < 1.5
                  , classy-prelude                >= 0.10.2