diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
index 15f238c..f39868d 100644
--- a/app/controllers/Application.scala
+++ b/app/controllers/Application.scala
@@ -9,7 +9,7 @@ import repositories.UserRepository
 class Application extends Controller {
 
   def index = Action {
-    UserRepository.insert(User(Some(1), "testtest"))
+    UserRepository.insert(User(Some(1), "testtest", "bla", "blaa"))
     Ok(views.html.index("Your new application is ready."))
   }
 
diff --git a/app/controllers/Sessions.scala b/app/controllers/Sessions.scala
new file mode 100644
index 0000000..995f925
--- /dev/null
+++ b/app/controllers/Sessions.scala
@@ -0,0 +1,15 @@
+package controllers
+
+import play.api.mvc._
+import org.mindrot.jbcrypt.BCrypt
+
+class Sessions extends Controller {
+  def create = Action(parse.urlFormEncoded) { implicit request =>
+    val email = request.body.get("email").get.head
+    val password = request.body.get("password").get.head
+
+    val user = UserRepository.findByEmail(email)
+    
+    Ok(s"$email $password")
+  }
+}
diff --git a/app/controllers/Users.scala b/app/controllers/Users.scala
new file mode 100644
index 0000000..ed84892
--- /dev/null
+++ b/app/controllers/Users.scala
@@ -0,0 +1,11 @@
+package controllers
+
+import play.api.mvc._
+
+class Users extends Controller {
+  def login = Action {
+    Ok(views.html.main("login") {
+      views.html.users.login()
+    })
+  }
+}
diff --git a/app/models/User.scala b/app/models/User.scala
index 3a88efd..b8eaf31 100644
--- a/app/models/User.scala
+++ b/app/models/User.scala
@@ -1,3 +1,3 @@
 package models
 
-case class User(id: Option[Int] = None, name: String)
+case class User(id: Option[Int] = None, email: String, password: String, salt: String)
diff --git a/app/repositories/UserRepository.scala b/app/repositories/UserRepository.scala
index 7880dd6..5cda248 100644
--- a/app/repositories/UserRepository.scala
+++ b/app/repositories/UserRepository.scala
@@ -1,16 +1,29 @@
 package repositories
 
 import slick.driver.PostgresDriver.simple._
+import slick.driver.JdbcProfile
+
+import play.api.Play.current
+import play.api.db.slick.DatabaseConfigProvider
+import play.api.db.DBApi
+
+import scala.concurrent.Future
+
 import models.User
 import tables.UserTable
 
 object UserRepository extends UserTable {
-  val db = Database.forConfig("testdb")
-  val users = TableQuery[Users]
+  protected val dbConfig = DatabaseConfigProvider.get[JdbcProfile]("testdb")(current)
+  import dbConfig._
+  import dbConfig.driver.api._
 
   def insert(user: User) = {
     db.withSession { implicit session =>
       users.insert(user)
     }
   }
+
+  def findByEmail(email: String) : Option[User] = {
+    
+  }
 }
diff --git a/app/tables/UserTable.scala b/app/tables/UserTable.scala
index 9b2ac07..288966e 100644
--- a/app/tables/UserTable.scala
+++ b/app/tables/UserTable.scala
@@ -1,13 +1,18 @@
 package tables
 
-import models.User
 import slick.driver.PostgresDriver.api._
+import models.User
 
 trait UserTable {
   class Users(tag: Tag) extends Table[User](tag, "users") {
     def id = column[Int]("id", O.PrimaryKey, O.AutoInc)
-    def name = column[String]("name")
+    def email = column[String]("email")
+    def password = column[String]("password")
+    def salt = column[String]("salt")
+
     def * =
-      (id.?, name) <> (User.tupled, User.unapply)
+      (id.?, email, password, salt) <> (User.tupled, User.unapply)
   }
+
+  val users = TableQuery[Users]
 }
diff --git a/app/views/index.scala.html b/app/views/index.scala.html
index d6a6b22..da11cbf 100644
--- a/app/views/index.scala.html
+++ b/app/views/index.scala.html
@@ -1,7 +1,5 @@
 @(message: String)
 
 @main("Welcome to Play") {
-
-    @play20.welcome(message)
-
+  Test
 }
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
index aff0eff..51c39db 100644
--- a/app/views/main.scala.html
+++ b/app/views/main.scala.html
@@ -3,13 +3,19 @@
 <!DOCTYPE html>
 
 <html lang="en">
-    <head>
-        <title>@title</title>
-        <link rel="stylesheet" media="screen" href="@routes.Assets.versioned("stylesheets/main.css")">
-        <link rel="shortcut icon" type="image/png" href="@routes.Assets.versioned("images/favicon.png")">
-        <script src="@routes.Assets.versioned("javascripts/hello.js")" type="text/javascript"></script>
-    </head>
-    <body>
-        @content
-    </body>
+  <head>
+      <title>@title</title>
+      <link rel="stylesheet" media="screen" href="@routes.Assets.versioned("stylesheets/main.css")">
+      <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+      <link rel="shortcut icon" type="image/png" href="@routes.Assets.versioned("images/favicon.png")">
+      <script src="@routes.Assets.versioned("javascripts/hello.js")" type="text/javascript"></script>
+  </head>
+  <body>
+    <div class="navbar">
+      @navbar()
+    </div>
+    <div class="main-content container">
+      @content
+    </div>
+  </body>
 </html>
diff --git a/app/views/navbar.scala.html b/app/views/navbar.scala.html
new file mode 100644
index 0000000..ab86d61
--- /dev/null
+++ b/app/views/navbar.scala.html
@@ -0,0 +1,7 @@
+<nav class="navbar navbar-inverse">
+  <ul class="nav navbar-nav">
+    <li>
+      <a href="/users/login"> Login </a>
+    </li>
+  </ul>
+</nav>
diff --git a/app/views/users/login.scala.html b/app/views/users/login.scala.html
new file mode 100644
index 0000000..85916c0
--- /dev/null
+++ b/app/views/users/login.scala.html
@@ -0,0 +1,11 @@
+<form action="/sessions/create" method="POST" enctype="application/x-www-form-urlencoded">
+  <div class="form-group">
+    <label> E-Mail </label>
+    <input type="email" name="email" class="form-control" required />
+  </div>
+  <div class="form-group">
+    <label> Password </label>
+    <input type="password" name="password" class="form-control" required />
+  </div>
+  <input type="submit" value="Login" />
+</form>
diff --git a/build.sbt b/build.sbt
index 74c87a0..4c0432b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -7,15 +7,17 @@ lazy val root = (project in file(".")).enablePlugins(PlayScala)
 scalaVersion := "2.11.6"
 
 libraryDependencies ++= Seq(
-  jdbc,
   cache,
   ws,
   specs2 % Test,
   "com.typesafe.play" %% "play-slick" % "1.0.0",
-  "org.postgresql" % "postgresql" % "9.4-1200-jdbc4"
+  "com.typesafe.play" %% "play-slick-evolutions" % "1.0.0",
+  "org.postgresql" % "postgresql" % "9.4-1200-jdbc4",
+  "org.mindrot" % "jbcrypt" % "0.3m"
 )
 
 resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases"
+resolvers += "jbcrypt repo" at "http://mvnrepository.com/"
 
 // Play provides two styles of routers, one expects its actions to be injected, the
 // other, legacy style, accesses its actions statically.
diff --git a/conf/application.conf b/conf/application.conf
index 2b5b281..a6f20ae 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -1,51 +1,16 @@
-# This is the main configuration file for the application.
-# ~~~~~
-
-# Secret key
-# ~~~~~
-# The secret key is used to secure cryptographics functions.
-#
-# This must be changed for production, but we recommend not changing it in this file.
-#
-# See http://www.playframework.com/documentation/latest/ApplicationSecret for more details.
 play.crypto.secret = "changeme"
 
-# The application languages
-# ~~~~~
 play.i18n.langs = [ "en" ]
 
-# Router
-# ~~~~~
-# Define the Router object to use for this application.
-# This router will be looked up first when the application is starting up,
-# so make sure this is the entry point.
-# Furthermore, it's assumed your route file is named properly.
-# So for an application router like `my.application.Router`,
-# you may need to define a router file `conf/my.application.routes`.
-# Default to Routes in the root package (and conf/routes)
-# play.http.router = my.application.Routes
-
-# Database configuration
-# ~~~~~
-# You can declare as many datasources as you want.
-# By convention, the default datasource is named `default`
-#
-# db.default.driver=org.h2.Driver
-# db.default.url="jdbc:h2:mem:play"
-# db.default.user=sa
-# db.default.password=""
-
-testdb: {
-  driver: "org.postgresql.Driver",
-  url: "jdbc:postgresql://localhost:5432/play_app",
-  user: "fh",
-  password: ""
+slick.dbs {
+  testdb: {
+    driver: "slick.driver.PostgresDriver$"
+    
+    db: {
+      driver: "org.postgresql.Driver",
+      url: "jdbc:postgresql://localhost:5432/play_app",
+      username: "fh",
+      password: ""
+    }
+  }
 }
-
-# Evolutions
-# ~~~~~
-# You can disable evolutions if needed
-# play.evolutions.enabled=false
-
-# You can disable evolutions for a specific datasource if necessary
-# play.evolutions.db.default.enabled=false
diff --git a/conf/evolutions/testdb/1.sql b/conf/evolutions/testdb/1.sql
new file mode 100644
index 0000000..657b54e
--- /dev/null
+++ b/conf/evolutions/testdb/1.sql
@@ -0,0 +1,14 @@
+# Users schema
+
+# --- !Ups
+
+CREATE TABLE "users" (
+  id bigserial primary key,
+  email varchar(255) not null,
+  password varchar(255) not null,
+  salt varchar(255) not null
+);
+
+# --- !Downs
+
+DROP TABLE "users";
diff --git a/conf/routes b/conf/routes
index e71a0bd..a48def1 100644
--- a/conf/routes
+++ b/conf/routes
@@ -1,9 +1,9 @@
-# Routes
-# This file defines all application routes (Higher priority routes first)
-# ~~~~
-
-# Home page
 GET     /                           controllers.Application.index
 
+# User routes
+GET     /users/login                controllers.Users.login
+
+POST    /sessions/create            controllers.Sessions.create
+
 # Map static resources from the /public folder to the /assets URL path
 GET     /assets/*file               controllers.Assets.versioned(path="/public", file: Asset)
