diff --git a/application/config/email.php b/application/config/email.php
new file mode 100644
index 0000000..97816b8
--- /dev/null
+++ b/application/config/email.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 15:17
+ */
+
+
+$config['charset'] = 'iso-8859-1';
+$config['protocol'] = getenv( 'PROTOCOL' );
+$config['smtp_host'] = getenv( 'SMTP_HOST' );
+$config['smtp_user'] = getenv( 'SMTP_USER' );
+$config['smtp_pass'] = getenv( 'SMTP_PASS' );
+$config['smtp_port'] = getenv( 'SMTP_PORT' );
+
+
+
+
diff --git a/application/controllers/beheer/customersController.php b/application/controllers/beheer/customersController.php
new file mode 100644
index 0000000..fe40206
--- /dev/null
+++ b/application/controllers/beheer/customersController.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * Customer: Theo Weijmer
+ * Date: 25/12/2017
+ * Time: 10:11
+ */
+
+class customersController extends MY_Controller {
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $models = [];
+        $libraries = [];
+
+        $this->load->model( $models );
+        $this->load->library( $libraries );
+    }
+
+    public function index()
+    {
+
+    }
+
+    public function getAllCustomers( $archive = 'F' )
+    {
+        $users = Customer::getAllCustomers( $archive );
+
+        $this->json( $users );
+    }
+
+    public function saveCustomer()
+    {
+        $userValidation = new CustomerValidation();
+
+        if ( ! $userValidation->getValidationResult() )
+            return $this->json( [
+                'success' => FALSE, 'messages' => $userValidation->getErrorMessages()] );
+
+        $user = $this->input->post();
+
+        $userID = $user['id'];
+        unset( $user['id'] );
+
+        $userID = Customer::saveCustomer( $userID, $user );
+
+        $this->json( ['success' => TRUE, 'userID' => $userID] );
+    }
+
+    public function archiveCustomer( $userID, $status )
+    {
+        Customer::whereId( $userID )->update( ['archive' => $status] );
+    }
+
+    public function removeCustomer( $userID )
+    {
+        $removeCustomer = new RemoveCustomer( $userID );
+
+        if ( $removeCustomer->getAllowDelete() === FALSE ) return $this->json( ['result' => FALSE] );
+
+        Customer::removeCustomer( $userID );
+
+        $this->json( ['result' => TRUE] );
+    }
+}
\ No newline at end of file
diff --git a/application/controllers/beheer/usersController.php b/application/controllers/beheer/usersController.php
index b5866f9..26da539 100644
--- a/application/controllers/beheer/usersController.php
+++ b/application/controllers/beheer/usersController.php
@@ -37,20 +37,63 @@ class usersController extends MY_Controller {
 
         if ( ! $userValidation->getValidationResult() )
             return $this->json( [
-                'success'=> false, 'messages' =>$userValidation->getErrorMessages()] );
+                'success' => FALSE, 'messages' => $userValidation->getErrorMessages()] );
 
         $user = $this->input->post();
 
         $userID = $user['id'];
-        unset($user['id']);
+        unset( $user['id'] );
 
-        if( $userID == 0 )
-        {
-            createNewUser();
-        }
+        if ( $userID == 0 ) $user = $this->newUser( $user );
 
-        $userID = User::saveUser( $userID, $user);
+        $user['role'] = empty( $user['role'] ) ? NULL : $user['role'];
 
-        $this->json( ['success' => TRUE] );
+        $userID = User::saveUser( $userID, $user );
+
+        $this->json( ['success' => TRUE, 'userID' => $userID] );
+    }
+
+    public function archiveUser( $userID, $status )
+    {
+        User::whereId( $userID )->update( ['archive' => $status] );
+    }
+
+    public function removeUser( $userID )
+    {
+        $removeUser = new RemoveUser( $userID );
+
+        if ( $removeUser->getAllowDelete() === FALSE ) return $this->json( ['result' => FALSE] );
+
+        User::removeUser( $userID );
+
+        $this->json( ['result' => TRUE] );
+    }
+
+    private function newUser( $user )
+    {
+        $userCreation = new UserCreation( $user );
+
+        $user = $userCreation->getUser();
+
+        $password = $userCreation->getPassword();
+
+        $this->sendWelcomeEmail( $user, $password );
+
+        return $user;
+    }
+
+    private function sendWelcomeEmail( $user, $password )
+    {
+        $this->load->library( 'email' );
+
+        $html = $this->load->view( 'emails/welcome_email', [
+            'password' => $password, 'user' => $user], TRUE );
+
+        $this->email->from( 'noreply@debeleidsonderzoekers.nl', 'DBOIS' );
+        $this->email->to( $user['email'] );
+        $this->email->subject( 'Wachtwoord DBOIS' );
+        $this->email->message( $html );
+
+        $this->email->send();
     }
 }
\ No newline at end of file
diff --git a/application/libraries/beheer/user/PasswordRecipe.php b/application/libraries/beheer/user/PasswordRecipe.php
index dfbc2d6..db3cf5b 100644
--- a/application/libraries/beheer/user/PasswordRecipe.php
+++ b/application/libraries/beheer/user/PasswordRecipe.php
@@ -8,8 +8,8 @@
 
 class PasswordRecipe {
 
-    private $nakedPassword = false;
-    private $salt = false;
+    private $password = FALSE;
+    private $salt     = FALSE;
     private $saltedPassword;
 
     public function __construct()
@@ -17,9 +17,24 @@ class PasswordRecipe {
         $this->handle();
     }
 
-    public function setNakedPassword( $nakedPassword )
+    public function getPassword()
     {
-        $this->nakedPassword = $nakedPassword;
+        return $this->password;
+    }
+
+    public function getSalt()
+    {
+        return $this->salt;
+    }
+
+    public function getSaltedPassword()
+    {
+        return $this->saltedPassword;
+    }
+
+    public function setPassword( $password )
+    {
+        $this->password = $password;
     }
 
     public function setSalt( $salt )
@@ -29,52 +44,55 @@ class PasswordRecipe {
 
     private function handle()
     {
-        $this->checkNakedPassword();
+        $this->checkPassword();
 
         $this->checkSalt();
 
         $this->setSaltedPassword();
     }
 
-    private function checkNakedPassword()
+    private function checkPassword()
     {
-        if( ! $this->nakedPassword ) $this->createNakedPassword();
+        if ( ! $this->password ) $this->createPassword();
 
-        if( strlen($this->nakedPassword)  < 6 ) return;
+        if ( strlen( $this->password ) < 6 ) return;
     }
 
     private function checkSalt()
     {
-        if( ! $this->salt ) $this->createSalt();
+        if ( ! $this->salt ) $this->createSalt();
     }
 
-    private function createNakedPassword()
+    private function createPassword()
     {
-        $pass = $this->getRandomString(8);
+        $pass = $this->getRandomString( 8 );
 
-        $this->nakedPassword = $pass;
+        $this->password = $pass;
     }
 
     private function createSalt()
     {
-        $salt = $this->getRandomString(8);
+        $salt = $this->getRandomString( 18 );
 
-        $this->salt = $salt;
+        $this->salt = sha1($salt);
     }
 
     private function setSaltedPassword()
     {
-        $this->saltedPassword = sha1($this->)
+        $this->saltedPassword = sha1( sha1( $this->password ) . $this->salt );
     }
 
-    private function getRandomString( $length=8 )
+    private function getRandomString( $length = 8 )
     {
         $rand = '';
         $alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-        $alphaLength = strlen($alphabet) - 1; //put the length -1 in cache
-        for ($i = 0; $i < $length; $i++) {
-            $n = rand(0, $alphaLength);
-            $rand.= $alphabet[$n];
+        $alphaLength = strlen( $alphabet ) - 1; //put the length -1 in cache
+        for ( $i = 0; $i < $length; $i ++ )
+        {
+            $n = rand( 0, $alphaLength );
+            $rand .= $alphabet[ $n ];
         }
+
+        return $rand;
     }
-}
\ No newline at end of file
+}
diff --git a/application/libraries/beheer/user/RemoveUser.php b/application/libraries/beheer/user/RemoveUser.php
new file mode 100644
index 0000000..eb04c3b
--- /dev/null
+++ b/application/libraries/beheer/user/RemoveUser.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemoveUser {
+
+    private $userID;
+    private $allowDelete=FALSE;
+
+    public function __construct( $userID )
+    {
+        $this->setUserID($userID);
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setUserID( $userID )
+    {
+        $this->userID = $userID;
+    }
+
+    private function handle()
+    {
+        //$this->checkIfUserHasProjects();
+    }
+
+}
\ No newline at end of file
diff --git a/application/libraries/beheer/user/UserCreation.php b/application/libraries/beheer/user/UserCreation.php
new file mode 100644
index 0000000..c700fb9
--- /dev/null
+++ b/application/libraries/beheer/user/UserCreation.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 14:10
+ */
+
+class UserCreation {
+
+    private $user;
+    private $passWordRecipe;
+    private $password;
+    private $saltedPassword;
+    private $salt;
+
+    public function __construct( $user )
+    {
+        $this->setUser( $user );
+
+        $this->handle();
+    }
+
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    private function setUser( $user )
+    {
+        $this->user = $user;
+    }
+
+    private function handle()
+    {
+        $this->passWordRecipe = new PasswordRecipe();
+
+        $this->setPassword();
+
+        $this->setSalt();
+
+        $this->setSaltedPassword();
+
+        $this->enrichUser();
+    }
+
+    private function setPassword()
+    {
+        $this->password = $this->passWordRecipe->getPassword();
+    }
+
+    private function setSalt()
+    {
+        $this->salt = $this->passWordRecipe->getSalt();
+    }
+
+    private function setSaltedPassword()
+    {
+        $this->saltedPassword = $this->passWordRecipe->getSaltedPassword();
+    }
+
+    private function enrichUser()
+    {
+        $this->user['password'] = $this->saltedPassword;
+        $this->user['salt'] = $this->salt;
+    }
+}
\ No newline at end of file
diff --git a/application/libraries/validation/inputValidations/CustomerValidation.php b/application/libraries/validation/inputValidations/CustomerValidation.php
new file mode 100644
index 0000000..190248a
--- /dev/null
+++ b/application/libraries/validation/inputValidations/CustomerValidation.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'libraries/validation/inputValidations/BaseValidation.php' );
+
+class CustomerValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'name'      => [
+            'validations' => 'required|alphaNumericSpaces',
+            'fieldname'   => 'name'
+        ],
+        'contactperson' => [
+            'validations' => 'required|alphaNumericSpaces',
+            'fieldname'   => 'contactperson'
+        ],
+        'email' => [
+            'validations' => 'email',
+            'fieldname'   => 'email'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->ci =& get_instance();
+    }
+}
\ No newline at end of file
diff --git a/application/models/beheer/Customer_model.php b/application/models/beheer/Customer_model.php
new file mode 100644
index 0000000..4ca6450
--- /dev/null
+++ b/application/models/beheer/Customer_model.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 15/12/2017
+ * Time: 19:37
+ */
+
+class Customer_model extends MY_Model {
+
+    protected $tablename = "customers";
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+}
\ No newline at end of file
diff --git a/application/models/beheer/User_model.php b/application/models/beheer/User_model.php
index 2ca8d67..bcc3ca4 100644
--- a/application/models/beheer/User_model.php
+++ b/application/models/beheer/User_model.php
@@ -28,7 +28,7 @@ class User_model extends MY_Model {
         $this->sql = "
             SELECT          *
             FROM            users
-            WHERE           ucase( {$field} ) = '{strtoupper($fieldValue)}'
+            WHERE           ucase( {$field} ) = '".strtoupper($fieldValue)."'
               AND           id != {$recordID} ";
 
         $result = $this->get_query_row();
diff --git a/application/models/eloquent/BaseModel.php b/application/models/eloquent/BaseModel.php
index 20612ea..b6e8383 100644
--- a/application/models/eloquent/BaseModel.php
+++ b/application/models/eloquent/BaseModel.php
@@ -27,7 +27,7 @@ class BaseModel extends Eloquent {
 
     protected $guarded = [];
 
-    protected $hidden = ['creation_date', 'last_update_date', 'created_by', 'updated_by'];
+    protected $hidden = ['creation_date', 'last_update_date', 'created_by', 'updated_by', 'password', 'salt'];
 
     protected static $oldValue;
 
diff --git a/application/models/eloquent/Customer.php b/application/models/eloquent/Customer.php
new file mode 100644
index 0000000..71c34e8
--- /dev/null
+++ b/application/models/eloquent/Customer.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * Customer: Theo Weijmer
+ * Date: 21/12/2017
+ * Time: 18:04
+ */
+
+
+class Customer extends BaseModel {
+
+    protected $table = "customers";
+
+    public static function getAllCustomers( $archive )
+    {
+        $customers = Customer::orderBy( 'name' );
+
+        if ( $archive == 'F' ) $customers = $customers->whereArchive( 'F' );
+
+        $customers = $customers->get();
+
+        return $customers;
+    }
+
+    public static function saveCustomer( $customerID, $customer )
+    {
+        $customer = (array)$customer;
+
+        if( $customerID == 0)
+        {
+            $customer = Customer::create($customer);
+        }
+        else
+        {
+            $customer = Customer::whereId($customerID)->update($customer);
+        }
+
+        return $customer['id'];
+    }
+
+    public static function removeCustomer($customerID)
+    {
+        Customer::whereId($customerID)->delete();
+    }
+
+
+}
\ No newline at end of file
diff --git a/application/models/eloquent/User.php b/application/models/eloquent/User.php
index ad399dc..c62ef07 100644
--- a/application/models/eloquent/User.php
+++ b/application/models/eloquent/User.php
@@ -47,18 +47,23 @@ class User extends BaseModel {
 
     public static function saveUser( $userID, $user )
     {
+        $user = (array)$user;
+
         if( $userID == 0)
         {
             $user = User::create($user);
         }
         else
         {
-            $user = User::whereId($userID);
-
-            $user->update($user);
+            $user = User::whereId($userID)->update($user);
         }
 
-        return $user->id;
+        return $user['id'];
+    }
+
+    public static function removeUser($userID)
+    {
+        User::whereId($userID)->delete();
     }
 
 
diff --git a/application/views/emails/welcome_email.php b/application/views/emails/welcome_email.php
new file mode 100644
index 0000000..f9ccf4f
--- /dev/null
+++ b/application/views/emails/welcome_email.php
@@ -0,0 +1,375 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta name="viewport" content="width=device-width"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>wachtwoord DBOIS</title>
+    <link href="styles.css" media="all" rel="stylesheet" type="text/css"/>
+</head>
+<style>
+
+    /* -------------------------------------
+        GLOBAL
+    ------------------------------------- */
+    * {
+        margin: 0;
+        padding: 0;
+        font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
+        box-sizing: border-box;
+        font-size: 14px;
+    }
+
+    img {
+        max-width: 100%;
+    }
+
+    body {
+        -webkit-font-smoothing: antialiased;
+        -webkit-text-size-adjust: none;
+        width: 100% !important;
+        height: 100%;
+        line-height: 1.6;
+    }
+
+    /* Let's make sure all tables have defaults */
+    table td {
+        vertical-align: top;
+    }
+
+    /* -------------------------------------
+        BODY & CONTAINER
+    ------------------------------------- */
+    body {
+        background-color: #f6f6f6;
+    }
+
+    .body-wrap {
+        background-color: #f6f6f6;
+        width: 100%;
+    }
+
+    .container {
+        display: block !important;
+        max-width: 600px !important;
+        margin: 0 auto !important;
+        /* makes it centered */
+        clear: both !important;
+    }
+
+    .content {
+        max-width: 600px;
+        margin: 0 auto;
+        display: block;
+        padding: 20px;
+    }
+
+    /* -------------------------------------
+        HEADER, FOOTER, MAIN
+    ------------------------------------- */
+    .main {
+        background: #fff;
+        border: 1px solid #e9e9e9;
+        border-radius: 3px;
+    }
+
+    .content-wrap {
+        padding: 20px;
+    }
+
+    .content-block {
+        padding: 0 0 20px;
+    }
+
+    .header {
+        width: 100%;
+        margin-bottom: 20px;
+    }
+
+    .footer {
+        width: 100%;
+        clear: both;
+        color: #999;
+        padding: 20px;
+    }
+
+    .footer a {
+        color: #999;
+    }
+
+    .footer p, .footer a, .footer unsubscribe, .footer td {
+        font-size: 12px;
+    }
+
+    /* -------------------------------------
+        GRID AND COLUMNS
+    ------------------------------------- */
+    .column-left {
+        float: left;
+        width: 50%;
+    }
+
+    .column-right {
+        float: left;
+        width: 50%;
+    }
+
+    /* -------------------------------------
+        TYPOGRAPHY
+    ------------------------------------- */
+    h1, h2, h3 {
+        font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+        color: #000;
+        margin: 40px 0 0;
+        line-height: 1.2;
+        font-weight: 400;
+    }
+
+    h1 {
+        font-size: 32px;
+        font-weight: 500;
+    }
+
+    h2 {
+        font-size: 24px;
+    }
+
+    h3 {
+        font-size: 18px;
+    }
+
+    h4 {
+        font-size: 14px;
+        font-weight: 600;
+    }
+
+    p, ul, ol {
+        margin-bottom: 10px;
+        font-weight: normal;
+    }
+
+    p li, ul li, ol li {
+        margin-left: 5px;
+        list-style-position: inside;
+    }
+
+    /* -------------------------------------
+        LINKS & BUTTONS
+    ------------------------------------- */
+    a {
+        color: #348eda;
+        text-decoration: underline;
+    }
+
+    .btn-primary {
+        text-decoration: none;
+        color: #FFF;
+        background-color: #348eda;
+        border: solid #348eda;
+        border-width: 10px 20px;
+        line-height: 2;
+        font-weight: bold;
+        text-align: center;
+        cursor: pointer;
+        display: inline-block;
+        border-radius: 5px;
+        text-transform: capitalize;
+    }
+
+    /* -------------------------------------
+        OTHER STYLES THAT MIGHT BE USEFUL
+    ------------------------------------- */
+    .last {
+        margin-bottom: 0;
+    }
+
+    .first {
+        margin-top: 0;
+    }
+
+    .padding {
+        padding: 10px 0;
+    }
+
+    .aligncenter {
+        text-align: center;
+    }
+
+    .alignright {
+        text-align: right;
+    }
+
+    .alignleft {
+        text-align: left;
+    }
+
+    .clear {
+        clear: both;
+    }
+
+    /* -------------------------------------
+        Alerts
+    ------------------------------------- */
+    .alert {
+        font-size: 16px;
+        color: #fff;
+        font-weight: 500;
+        padding: 20px;
+        text-align: center;
+        border-radius: 3px 3px 0 0;
+    }
+
+    .alert a {
+        color: #fff;
+        text-decoration: none;
+        font-weight: 500;
+        font-size: 16px;
+    }
+
+    .alert.alert-warning {
+        background: #ff9f00;
+    }
+
+    .alert.alert-bad {
+        background: #d0021b;
+    }
+
+    .alert.alert-good {
+        background: #68b90f;
+    }
+
+    /* -------------------------------------
+        INVOICE
+    ------------------------------------- */
+    .invoice {
+        margin: 40px auto;
+        text-align: left;
+        width: 80%;
+    }
+
+    .invoice td {
+        padding: 5px 0;
+    }
+
+    .invoice .invoice-items {
+        width: 100%;
+    }
+
+    .invoice .invoice-items td {
+        border-top: #eee 1px solid;
+    }
+
+    .invoice .invoice-items .total td {
+        border-top: 2px solid #333;
+        border-bottom: 2px solid #333;
+        font-weight: 700;
+    }
+
+    /* -------------------------------------
+        RESPONSIVE AND MOBILE FRIENDLY STYLES
+    ------------------------------------- */
+    @media only screen and (max-width: 640px) {
+        h1, h2, h3, h4 {
+            font-weight: 600 !important;
+            margin: 20px 0 5px !important;
+        }
+
+        h1 {
+            font-size: 22px !important;
+        }
+
+        h2 {
+            font-size: 18px !important;
+        }
+
+        h3 {
+            font-size: 16px !important;
+        }
+
+        .container {
+            width: 100% !important;
+        }
+
+        .content, .content-wrapper {
+            padding: 10px !important;
+        }
+
+        .invoice {
+            width: 100% !important;
+        }
+    }
+
+</style>
+
+<body>
+
+<table class="body-wrap">
+    <tr>
+        <td></td>
+        <td class="container" width="600">
+            <div class="content">
+                <table class="main" width="100%" cellpadding="0" cellspacing="0">
+                    <tr>
+                        <td class="alert alert-warning">
+                            Wachtwoord De Beleidsonderzoeker IS
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="content-wrap">
+                            <table width="100%" cellpadding="0" cellspacing="0">
+                                <tr>
+                                    <td class="content-block">
+                                        Hieronder vindt u uw gebruikersnaam wachtwoord om in te loggen op het
+                                        informatiesysteem van De Beleidsonderzoekers
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="content-block">
+                                        <p>
+                                            Beste <?= $user['firstname']?> <?=$user['middlename']?> <?=$user['lastname']?>
+                                        </p>
+                                        <p>
+                                            Er is voor u een account aangemaakt is het informatiesysteem van de Beleidsonderzoekers, hieronder vindt u uw gebruikersnaam en wachtwoord waarmee u kun t inloggen in het systeem.
+                                        </p>
+                                        <br />
+                                        <br />
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="content-block">
+
+                                        <table class="invoice">
+                                            <tr>
+                                                <td>
+                                                    <table class="invoice-items" cellpadding="0" cellspacing="0">
+                                                        <tr>
+                                                            <td>gebruikersnaam</td>
+                                                            <td class="alignright"><?= $user['username'] ?></td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>wacthwoord</td>
+                                                            <td class="alignright"><?= $password ?></td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="content-block">
+                                        <a href="<?php echo getenv('APP_URL'); ?>" class="btn-primary">
+                                            Ga naar de website
+                                        </a>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+        </td>
+        <td></td>
+    </tr>
+</table>
+</body>
+</html>
diff --git a/application/views/pages/customers_view.php b/application/views/pages/customers_view.php
new file mode 100644
index 0000000..85e6b5a
--- /dev/null
+++ b/application/views/pages/customers_view.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 29/12/2017
+ * Time: 14:17
+ */
\ No newline at end of file
diff --git a/application/views/pages/login/login_view.php b/application/views/pages/login/login_view.php
index b4943c1..436d0b2 100644
--- a/application/views/pages/login/login_view.php
+++ b/application/views/pages/login/login_view.php
@@ -32,9 +32,8 @@
     <link rel='stylesheet' href='http://fonts.googleapis.com/css?family=Roboto:300,400,500,300italic'>
 </head>
 <body class="animsition page-login-v3 layout-full">
-<?php $this->load->view('specials/notify_modal'); ?>
 <!-- Page -->
-<?php $this->load->view('specials/notifyme_modal'); ?>
+<?php $this->load->view('specials/tellme_modal'); ?>
 <div class="page vertical-align text-center" data-animsition-in="fade-in" data-animsition-out="fade-out">
     <div class="page-content vertical-align-middle animation-slide-top animation-duration-1">
         <div class="panel" id="login-form">
diff --git a/application/views/pages/users_view.php b/application/views/pages/users_view.php
index 5122fde..efc3388 100644
--- a/application/views/pages/users_view.php
+++ b/application/views/pages/users_view.php
@@ -4,17 +4,17 @@
             <table class="table table-sm">
                 <thead>
                 <tr>
-                    <th>voornaam</th>
-                    <th>achternaam</th>
-                    <th>tussenvoegsel</th>
-                    <th>gebruikersnaam</th>
-                    <th>email</th>
-                    <th>rol</th>
-                    <th>&nbsp;</th>
+                    <th class="table-tealish-header">voornaam</th>
+                    <th class="table-tealish-header">achternaam</th>
+                    <th class="table-tealish-header">tussenvoegsel</th>
+                    <th class="table-tealish-header">gebruikersnaam</th>
+                    <th class="table-tealish-header">email</th>
+                    <th class="table-tealish-header">rol</th>
+                    <th class="table-tealish-header">&nbsp;</th>
                 </tr>
                 </thead>
-                <tbody>
-                <tr data-bind="foreach:users">
+                <tbody data-bind="foreach:users">
+                <tr>
                     <td><span data-bind="text:lastname"></span></td>
                     <td><span data-bind="text:firstname"></span></td>
                     <td><span data-bind="text:middlename"></span></td>
@@ -22,19 +22,45 @@
                     <td><span data-bind="text:email"></span></td>
                     <td><span data-bind=""></span></td>
                     <td>
-                        <i class="icon fa-edit greenish" title="wijzig"></i>
-                        <i class="icon fa-archive blueish" title="archiveer"></i>
-                        <i class="icon fa-trash redish" title="verwijder"></i>
+                        <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editUser"></i>
+                        <!-- ko if:archive == 'F' -->
+                        <i class="icon fa-archive pointer" title="archiveer"
+                           data-bind="click:$root.archiveUser"></i>
+                        <!-- /ko -->
+                        <!-- ko if:archive != 'F' -->
+                        <i class="icon fa-minus-circle redish pointer" title="archiveer"
+                           data-bind="click:$root.archiveUser"></i>
+                        <!-- /ko -->
+                        <i class="icon fa-trash redish pointer" title="verwijder"
+                           data-bind="click:$root.removeUser"></i>
                     </td>
                 </tr>
                 </tbody>
                 <tfoot>
                 <tr>
-                    <td colspan="7">
+                    <td colspan="5" class="">
                         <button class="btn btn-primary btn-round btn-sm" data-bind="click:newUser">
                             nieuwe gebruiker
                         </button>
                     </td>
+                    <td colspan="2" class="">
+                        <div class="row form-horizontal">
+                            <label class="col-md-4 form-control-label">archief</label>
+                            <div class="col-md-8">
+                                <div class="onoffswitch" data-bind="click:toggleArchive">
+                                    <input type="checkbox"
+                                           name="onoffswitch"
+                                           class="onoffswitch-checkbox"
+                                           data-bind="checked:archive"
+                                           id="myonoffswitch">
+                                    <label class="onoffswitch-label" for="myonoffswitch">
+                                        <span class="onoffswitch-inner"></span>
+                                        <span class="onoffswitch-switch"></span>
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </td>
                 </tr>
                 </tfoot>
 
diff --git a/application/views/partials/_css.php b/application/views/partials/_css.php
index efe51c1..dfd0357 100644
--- a/application/views/partials/_css.php
+++ b/application/views/partials/_css.php
@@ -8,11 +8,10 @@
 
 <link rel="stylesheet" href="css/vendor/site.min.css">
 
-<link rel="stylesheet" href="vendor/plugins/animsition/animsition.css">
-<link rel="stylesheet" href="vendor/plugins/asscrollable/asScrollable.css">
-<link rel="stylesheet" href="vendor/plugins/switchery/switchery.css">
-<link rel="stylesheet" href="vendor/plugins/slidepanel/slidePanel.css">
-<link rel="stylesheet" href="vendor/plugins/flag-icon-css/flag-icon.css">
+<link rel="stylesheet" href="css/vendor/plugins/animsition/animsition.css">
+<link rel="stylesheet" href="css/vendor/plugins/asscrollable/asScrollable.css">
+<link rel="stylesheet" href="css/vendor/plugins/slidepanel/slidePanel.css">
+<link rel="stylesheet" href="css/vendor/plugins/flag-icon-css/flag-icon.css">
 <!-- End Stylesheets VENDOR -->
 
 <!-- Stylesheets Pensare -->
diff --git a/application/views/partials/_js.php b/application/views/partials/_js.php
index 78ee7a4..7d199aa 100644
--- a/application/views/partials/_js.php
+++ b/application/views/partials/_js.php
@@ -11,7 +11,6 @@
 <script src="js/vendor/ashoverscroll/jquery-asHoverScroll.js"></script>
 
 <!-- Plugins -->
-<script src="js/vendor/switchery/switchery.js"></script>
 <script src="js/vendor/intro-js/intro.js"></script>
 <script src="js/vendor/screenfull/screenfull.js"></script>
 <script src="js/vendor/slidepanel/jquery-slidePanel.js"></script>
@@ -52,8 +51,10 @@
 <script src="js/vendor/Knockout.min.js"></script>
 
 <script src="js/lib/main.js"></script>
+<script src="js/lib/modules/specials/tellmeModule.js"></script>
 <script src="js/lib/modules/menuModule.js"></script>
 <script src="js/lib/modules/beheer/usersModule.js"></script>
+<script src="js/lib/modules/beheer/customersModule.js"></script>
 <script src="js/lib/modules/modals/userModal.js"></script>
 
 
diff --git a/application/views/partials/_modals.php b/application/views/partials/_modals.php
index 039d929..912c72c 100644
--- a/application/views/partials/_modals.php
+++ b/application/views/partials/_modals.php
@@ -2,5 +2,6 @@
 
 $this->load->view('modals/user_modal');
 
+$this->load->view('specials/tellme_modal');
 ?>
 
diff --git a/application/views/specials/notify_modal.php b/application/views/specials/notify_modal.php
deleted file mode 100644
index 327549b..0000000
--- a/application/views/specials/notify_modal.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="modal fade" tabindex="-1" role="dialog" id="notify-me" data-bind="css:modalClass">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <!-- ko if:alert -->
-                <button type="button"
-                        class="close"
-                        data-dismiss="modal"
-                        aria-label="Close"
-                        data-bind="click:close">
-                    <span aria-hidden="true">&times;</span></button>
-                <!-- /ko -->
-                <h4 class="modal-title" data-bind="text:title"></h4>
-            </div>
-            <div class="modal-body">
-                <p data-bind="text:message"></p>
-            </div>
-            <div class="modal-footer">
-                <!-- ko if: notify -->
-                <button type="button"
-                        class="btn btn-default"
-                        data-dismiss="modal"
-                        data-bind="click:closeNo; text:noText"></button>
-                <button type="button"
-                        class="btn btn-primary"
-                        datya-bind="click:closeYes"></button>
-                <!-- /ko -->
-                <!-- ko if:alert -->
-                <button type="button"
-                        class="btn btn-primary"
-                        data-dismiss="modal"
-                        data-bind="click:closeOk, text:closeText"></button>
-                <!-- /ko -->
-            </div>
-        </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
\ No newline at end of file
diff --git a/application/views/specials/notifyme_modal.php b/application/views/specials/tellme_modal.php
similarity index 75%
rename from application/views/specials/notifyme_modal.php
rename to application/views/specials/tellme_modal.php
index bf642dc..73d0891 100644
--- a/application/views/specials/notifyme_modal.php
+++ b/application/views/specials/tellme_modal.php
@@ -1,4 +1,4 @@
-<div class="modal modal-3d-flip-vertical" tabindex="-1" role="dialog" id="notify-me" data-bind="css:modalClass">
+<div class="modal modal-3d-flip-vertical" tabindex="-1" role="dialog" id="tell-me" data-bind="css:modalClass">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -8,14 +8,14 @@
                 </button>
             </div>
             <div class="modal-body">
-                <p data-bind="text:message"></p>
+                <p data-bind="html:message"></p>
             </div>
             <div class="modal-footer">
                 <!-- ko if : notify() -->
                 <button type="button" class="btn btn-primary"
-                        data-bind="text:yesText; click:closeYes"></button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal"
-                        data-bind="text:noText; click:closeNo"></button>
+                        data-bind="text:yesText, click:closeYes"></button>
+                <button type="button" class="btn btn-secondary"
+                        data-bind="text:noText, click:closeNo"></button>
                 <!-- /ko -->
                 <!-- ko if : ! notify() -->
                 <button type="button" class="btn btn-primary" data-dismiss="modal"
diff --git a/composer.json b/composer.json
index c6b0327..3b4a091 100755
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
 	"autoload": {
 		"classmap": [
 			"application/models/eloquent",
-			"application/libraries/validation"
+			"application/libraries/validation",
+			"application/libraries/"
 		]
 	},
 	"suggest": {
diff --git a/public/css/correction.css b/public/css/correction.css
index 177a7dc..4c539db 100644
--- a/public/css/correction.css
+++ b/public/css/correction.css
@@ -4,6 +4,7 @@ body{
 }
 .page{
     background-color: #fff;
+    padding-top:20px;
 }
 .site-menubar{
     top:0;
diff --git a/public/css/main.css b/public/css/main.css
index b3a8391..9f74e01 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -6,4 +6,73 @@
 }
 .greenish{
     color:#5A9101;
+}
+.pointer{
+    cursor:pointer;
+}
+
+/*********TABLES************/
+
+.table-blueish-header{
+    background-color:#247CF0;
+    color:#fff !important;
+}
+.table-blueish-header{
+    background-color:#247CF0;
+    color:#fff !important;
+}
+.table-tealish-header{
+    background-color:#008577;
+    color:#fff !important;
+}
+.table-tealish-light-header{
+    background-color:#C3F7F2;
+    color:#fff !important;
+}
+
+/*********SWITCH************/
+.onoffswitch {
+    position: relative; width: 60px;
+    -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
+}
+.onoffswitch-checkbox {
+    display: none;
+}
+.onoffswitch-label {
+    display: block; overflow: hidden; cursor: pointer;
+    border: 2px solid #05A85C; border-radius: 16px;
+}
+.onoffswitch-inner {
+    display: block; width: 200%; margin-left: -100%;
+    transition: margin 0.3s ease-in 0s;
+}
+.onoffswitch-inner:before, .onoffswitch-inner:after {
+    display: block; float: left; width: 50%; height: 23px; padding: 0; line-height: 23px;
+    font-size: 11px; color: white; font-family: Trebuchet, Arial, sans-serif; font-weight: bold;
+    box-sizing: border-box;
+}
+.onoffswitch-inner:before {
+    content: "Ja";
+    padding-left: 10px;
+    background-color: #63BE62; color: #FFFFFF;
+}
+.onoffswitch-inner:after {
+    content: "nee";
+    padding-right: 10px;
+    background-color: #EEEEEE; color: #999999;
+    text-align: right;
+}
+.onoffswitch-switch {
+    display: block; width: 25px; margin: 1.5px;
+    background: #FFFFFF;
+    position: absolute; top: 0; bottom: 0;
+    right: 33px;
+    border: 2px solid #408C40; border-radius: 16px;
+    transition: all 0.3s ease-in 0s;
+}
+.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
+    margin-left: 0;
+}
+.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
+    right: 0px;
 }
\ No newline at end of file
diff --git a/public/js/lib/dataservices/customerDataservice.js b/public/js/lib/dataservices/customerDataservice.js
new file mode 100644
index 0000000..ebe27d6
--- /dev/null
+++ b/public/js/lib/dataservices/customerDataservice.js
@@ -0,0 +1,55 @@
+/**
+ * Created by Pensare Software.
+ * Customer: Theo Weijmer
+ * Date: 25/12/2017
+ * Time: 09:50
+ */
+
+dbo.customerDataService = {
+
+    getAllCustomers: function ( archive = 'F', callback ) {
+        $.getJSON( 'index.php/beheer/customersController/getAllCustomers/' + archive )
+            .done( function ( data ) {
+                callback( data );
+            } );
+    },
+
+    getCustomer: function ( userID, callback ) {
+        $.getJSON( 'index.php/beheer/customersController/getCustomer/' + userID )
+            .done( function ( data ) {
+                callback( data );
+            } );
+    },
+
+    checkCustomername: function ( username, callback ) {
+        $.post( 'index.php/beheer/userController/checkCustomername', 'json' )
+            .done( function ( data ) {
+                console.log( data );
+                callback( data );
+            } );
+    },
+
+    saveCustomer: function ( submitDATA, callback ) {
+        $.post( 'index.php/beheer/customersController/saveCustomer', submitDATA, function () {
+        }, 'json' )
+            .done( function ( data ) {
+                callback( data );
+            } );
+    },
+
+    archiveCustomer: function(userID, status, callback){
+        $.get('index.php/beheer/customersController/archiveCustomer/' + userID + '/' + status)
+            .done(function(){
+                callback();
+            });
+    },
+
+    removeCustomer: function ( userID, callback ) {
+        $.getJSON( 'index.php/beheer/customersController/removeCustomer/' + userID )
+            .done( function ( data ) {
+                callback( data );
+            } );
+    }
+
+
+}
\ No newline at end of file
diff --git a/public/js/lib/dataservices/userDataservice.js b/public/js/lib/dataservices/userDataservice.js
index ea02614..566be88 100644
--- a/public/js/lib/dataservices/userDataservice.js
+++ b/public/js/lib/dataservices/userDataservice.js
@@ -26,14 +26,29 @@ dbo.userDataService = {
             .done( function ( data ) {
                 console.log( data );
                 callback( data );
-            } )
+            } );
     },
 
     saveUser: function ( submitDATA, callback ) {
-        $.post( 'index.php/beheer/usersController/saveUser', submitDATA, 'json' )
+        $.post( 'index.php/beheer/usersController/saveUser', submitDATA, function () {
+        }, 'json' )
             .done( function ( data ) {
                 callback( data );
-            } )
+            } );
+    },
+
+    archiveUser: function(userID, status, callback){
+        $.get('index.php/beheer/usersController/archiveUser/' + userID + '/' + status)
+            .done(function(){
+                callback();
+            });
+    },
+
+    removeUser: function ( userID, callback ) {
+        $.getJSON( 'index.php/beheer/usersController/removeUser/' + userID )
+            .done( function ( data ) {
+                callback( data );
+            } );
     }
 
 
diff --git a/public/js/lib/main.js b/public/js/lib/main.js
index faaabe4..be8fc82 100644
--- a/public/js/lib/main.js
+++ b/public/js/lib/main.js
@@ -7,7 +7,7 @@
 
 var dbo = {};
 
-$(function(){
+$( function () {
 
     ko.bindingHandlers.stopBinding = {
         init: function () {
@@ -18,17 +18,15 @@ $(function(){
     ko.virtualElements.allowedBindings.stopBinding = true;
 
 
-
     ko.bindingHandlers.fadeVisible = {
-        init: function(element, valueAccessor) {
+        init  : function ( element, valueAccessor ) {
             var shouldDisplay = valueAccessor();
-            $(element).toggle(shouldDisplay);
+            $( element ).toggle( shouldDisplay );
         },
-        update: function(element, valueAccessor) {
+        update: function ( element, valueAccessor ) {
             // On update, fade in/out
             var shouldDisplay = valueAccessor();
-            shouldDisplay ? $(element).fadeIn(750) : $(element).fadeOut(750);
+            shouldDisplay ? $( element ).fadeIn( 750 ) : $( element ).fadeOut( 750 );
         }
     };
-
-});
\ No newline at end of file
+} );
\ No newline at end of file
diff --git a/public/js/lib/modules/beheer/customersModule.js b/public/js/lib/modules/beheer/customersModule.js
new file mode 100644
index 0000000..5ad1e28
--- /dev/null
+++ b/public/js/lib/modules/beheer/customersModule.js
@@ -0,0 +1,113 @@
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 29/12/2017
+ * Time: 14:19
+ */
+
+dbo.customersInit = function (){
+
+    if ( dbo.customersModel !== undefined ) {
+
+    } else {
+        dbo.customersModel = {
+
+            customers  : ko.observableArray( [] ),
+            customer   : ko.observable(),
+            archive: ko.observable( true ),
+
+            init: function () {
+                var vm = dbo.customersModel;
+
+                vm.refreshCustomers();
+            },
+
+            newCustomer: function () {
+                var vm = dbo.customersModel;
+
+                dbo.editCostomerModal.newEditCostumer( false, function () {
+                    vm.refreshCostumers();
+                } );
+            },
+
+            toggleArchive: function () {
+                var vm = dbo.customersModel;
+
+                vm.archive( !vm.archive() );
+
+                vm.refreshCostumers();
+            },
+
+            editCostumer: function () {
+                var customer = this;
+                var vm = dbo.customersModel;
+
+                dbo.editCostumerModal.newEditCostumer( customer, function () {
+                    vm.refreshCostumers();
+                } );
+            },
+
+            archiveCustomer: function () {
+                var vm = dbo.customersModel;
+                var self = this;
+
+                var status = self.archive == 'F' ? 'T' : 'F';
+
+                dbo.customerDataService.archiveCostumer( self.id, status, function () {
+                    vm.refreshCostumers();
+                } );
+            },
+
+            removeCostumer: function () {
+                var vm = dbo.customersModel;
+                var self = this;
+
+                tellMe( {
+                    title     : 'verwijderen opdrachtgever',
+                    message   : 'weet u zeker dat u de opdrachtgever wilt verwijderen, dit kan niet ongedaan worden gemaakt',
+                    notify    : true,
+                    noText    : 'nee verwijder de opdrachtgever niet',
+                    yesText   : 'ja verwijder de opdrachtgever',
+                    modalClass: 'modal-warning'
+                }, function ( response ) {
+                    console.log( response );
+                    if ( response ) {
+                        dbo.customerDataService.removeUser( self.id, function ( data ) {
+                            if ( data.result ) {
+                                tellMe( {
+                                    title     : 'opdrachtgever verwijderd',
+                                    message   : 'de opdrachtgever is succesvol verwijderd',
+                                    modalClass: 'modal-success'
+                                }, function () {
+                                    vm.refreshCostumers();
+                                } );
+                            } else {
+                                tellMe( {
+                                    title     : 'fout bij verwijderen opdrachtgever',
+                                    message   : 'de opdrachtgever kan niet worden verwijderd',
+                                    modalClass: 'modal-danger'
+                                } );
+                            }
+                        } );
+                    }
+                } );
+            },
+
+            refreshCustomers: function () {
+                var vm = dbo.customersModel;
+
+                dbo.customerDataService.getAllCustomers( vm.archive() ? 'T' : 'F', function ( data ) {
+                    vm.customers( data );
+                } );
+            }
+
+
+        };
+
+        dbo.customersModel.init();
+
+        ko.applyBindings( dbo.customersModel, document.getElementById( 'CUSTOMERS' ) );
+    }
+
+}
+
diff --git a/public/js/lib/modules/beheer/usersModule.js b/public/js/lib/modules/beheer/usersModule.js
index 699bb29..c98113b 100644
--- a/public/js/lib/modules/beheer/usersModule.js
+++ b/public/js/lib/modules/beheer/usersModule.js
@@ -13,16 +13,15 @@ dbo.usersInit = function () {
     } else {
         dbo.usersModel = {
 
-            users: ko.observableArray( [] ),
-            user : ko.observable(),
-            roles: ko.observableArray( [] ),
+            users  : ko.observableArray( [] ),
+            user   : ko.observable(),
+            roles  : ko.observableArray( [] ),
+            archive: ko.observable( true ),
 
             init: function () {
                 var vm = dbo.usersModel;
 
-                dbo.userDataService.getAllUsers( 'F', function ( data ) {
-                    vm.users( data );
-                } );
+                vm.refreshUsers();
 
                 dbo.rolesDataservice.getAllRoles( 'F', function ( data ) {
                     vm.roles( data );
@@ -30,9 +29,82 @@ dbo.usersInit = function () {
             },
 
             newUser: function () {
-                $( "#user-modal" ).modal( 'show' );
+                var vm = dbo.usersModel;
 
-                dbo.editUserModal.newUser();
+                dbo.editUserModal.newEditUser( false, function () {
+                    vm.refreshUsers();
+                } );
+            },
+
+            toggleArchive: function () {
+                var vm = dbo.usersModel;
+
+                vm.archive( !vm.archive() );
+
+                vm.refreshUsers();
+            },
+
+            editUser: function () {
+                var user = this;
+                var vm = dbo.usersModel;
+
+                dbo.editUserModal.newEditUser( user, function () {
+                    vm.refreshUsers();
+                } );
+            },
+
+            archiveUser: function () {
+                var vm = dbo.usersModel;
+                var self = this;
+
+                var status = self.archive == 'F' ? 'T' : 'F';
+
+                dbo.userDataService.archiveUser( self.id, status, function () {
+                    vm.refreshUsers();
+                } );
+            },
+
+            removeUser: function () {
+                var vm = dbo.usersModel;
+                var self = this;
+
+                tellMe( {
+                    title     : 'verwijderen gebruiker',
+                    message   : 'weet u zeker dat u de gebruiker wilt verwijderen, dit kan niet ongedaan worden gemaakt',
+                    notify    : true,
+                    noText    : 'nee verwijder de gebruiker niet',
+                    yesText   : 'ja verwijder de gebruiker',
+                    modalClass: 'modal-warning'
+                }, function ( response ) {
+                    console.log( response );
+                    if ( response ) {
+                        dbo.userDataService.removeUser( self.id, function ( data ) {
+                            if ( data.result ) {
+                                tellMe( {
+                                    title     : 'gebruiker verwijderd',
+                                    message   : 'de gebruiker is succesvol verwijderd',
+                                    modalClass: 'modal-success'
+                                }, function () {
+                                    vm.refreshUsers();
+                                } );
+                            } else {
+                                tellMe( {
+                                    title     : 'fout bij verwijderen gebruiker',
+                                    message   : 'de gebruiker kan niet worden verwijderd',
+                                    modalClass: 'modal-danger'
+                                } );
+                            }
+                        } );
+                    }
+                } );
+            },
+
+            refreshUsers: function () {
+                var vm = dbo.usersModel;
+
+                dbo.userDataService.getAllUsers( vm.archive() ? 'T' : 'F', function ( data ) {
+                    vm.users( data );
+                } );
             }
 
 
diff --git a/public/js/lib/modules/modals/userModal.js b/public/js/lib/modules/modals/userModal.js
index f9cc639..c67fd27 100644
--- a/public/js/lib/modules/modals/userModal.js
+++ b/public/js/lib/modules/modals/userModal.js
@@ -16,6 +16,7 @@ $( function () {
         username  : ko.observable(),
         email     : ko.observable(),
         role      : ko.observable(),
+        callback  : null,
 
         init: function () {
             var vm = dbo.editUserModal;
@@ -25,10 +26,13 @@ $( function () {
             } );
         },
 
-        newUser: function () {
+        newEditUser: function ( user, callback ) {
             var vm = dbo.editUserModal;
+            vm.callback = typeof(callback) == 'function' ? callback : null;
 
-            vm.setUser();
+            vm.showUserModal();
+
+            vm.setUser( user );
         },
 
         setRole: function () {
@@ -42,8 +46,6 @@ $( function () {
 
             if ( vm.formValid == false ) return;
 
-            dbo.userDataService.checkUsername()
-
             var submitDATA = {
                 id        : vm.id,
                 firstname : vm.firstname(),
@@ -55,35 +57,54 @@ $( function () {
             }
 
             dbo.userDataService.saveUser( submitDATA, function ( data ) {
-                if ( data.succes ) {
+                if ( data.success ) {
                     tellMe( {
                         title     : 'gebruiker aangemaakt',
-                        message   : 'gebuiker is succesvol aangemaakt',
+                        message   : 'gebuiker is succesvol opgeslagen',
                         modalClass: 'modal-success'
+                    }, function(){
+                        vm.hideUserModal();
+
+                        if( typeof(vm.callback) == 'function') vm.callback();
                     } );
+
                     return;
                 }
 
-                tellMe({
+                var errorMessage = '<ul>';
+                $.each( data.messages, function ( i, p ) {
+                    if ( p[0] ) {
+                        errorMessage += '<li>' + i + ': ' + p[0] + '</li>';
+                    }
+                } );
+                errorMessage += '</ul>';
+                tellMe( {
                     title     : 'fout aanmaken gebruiker',
-                    message   : data.errorMessages,
+                    message   : errorMessage,
                     modalClass: 'modal-danger'
-                });
-            } )
-
-
+                } );
+            } );
         },
 
-        setUser: function ( user = false ) {
+        setUser: function ( user ) {
             var vm = dbo.editUserModal;
+            var role = isNaN( user.role ) ? null : user.role;
 
             vm.id = user.id || 0;
             vm.firstname( user.firstname || '' );
-            vm.lastname( user.firstname || '' );
-            vm.middlename( user.firstname || '' );
+            vm.lastname( user.lastname || '' );
+            vm.middlename( user.middlename || '' );
             vm.username( user.username || '' );
             vm.email( user.email || '' );
             vm.role( user.role || null );
+        },
+
+        showUserModal: function () {
+            $( "#user-modal" ).modal( 'show' );
+        },
+
+        hideUserModal: function () {
+            $( "#user-modal" ).modal( 'hide' );
         }
     };
 
@@ -91,7 +112,6 @@ $( function () {
 
     dbo.editUserModal.lastnameInvalid = ko.pureComputed( function () {
         if ( !this.lastname() ) return true;
-        console.log( this.lastname() );
 
         if ( this.lastname().length < 2 ) return true;
 
diff --git a/public/js/lib/modules/specials/notifyModule.js b/public/js/lib/modules/specials/notifyModule.js
deleted file mode 100644
index a671bc2..0000000
--- a/public/js/lib/modules/specials/notifyModule.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Created by Pensare Software.
- * User: Theo Weijmer
- * Date: 13/12/2017
- * Time: 17:08
- */
-
-var tellMe = function ( options, callback ) {
-    dbo.notifyModel.init( options, callback );
-}
-
-dbo.notifyModel = {
-
-    title     : ko.observable( null ),
-    message   : ko.observable( null ),
-    notify    : ko.observable( false ),
-    alert     : ko.observable( false ),
-    noText    : ko.observable( null ),
-    yesText   : ko.observable( null ),
-    closeText : ko.observable( null ),
-    modalClass: ko.observable( null ),
-    callback  : null,
-
-    init: function ( options, callback ) {
-        var vm = dbo.notifyModel;
-
-        vm.callback = callback;
-
-        vm.setOptions( options );
-
-        $( "#notify-me" ).modal( 'show' );
-    },
-
-    setOptions: function ( options ) {
-        var vm = dbo.notifyModel;
-
-        vm.title( options.title || '' );
-        vm.message( options.message || '' );
-        vm.notify( options.notify || false );
-        vm.noText( options.noText || 'Nee' );
-        vm.yesText( options.yesText || 'Ja' );
-        vm.closeText( options.closeText || 'ok' );
-        vm.modalClass( options.modalClass || 'modal-primary' )
-    },
-
-    closeNo: function () {
-        if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback( false );
-    },
-
-    closeYes: function () {
-        if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback( true );
-    },
-
-    closeOk: function () {
-        if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback();
-    },
-
-    close: function () {
-        if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback();
-    }
-
-
-}
-
-ko.applyBindings( dbo.notifyModel, document.getElementById( "notify-me" ) );
-
-
diff --git a/public/js/lib/modules/specials/tellmeModule.js b/public/js/lib/modules/specials/tellmeModule.js
new file mode 100644
index 0000000..47fd14f
--- /dev/null
+++ b/public/js/lib/modules/specials/tellmeModule.js
@@ -0,0 +1,88 @@
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 13/12/2017
+ * Time: 17:08
+ */
+
+var tellMe = function ( options, callback ) {
+    dbo.tellmeModel.init( options, callback );
+}
+
+dbo.tellmeModel = {
+
+    title     : ko.observable( null ),
+    message   : ko.observable( null ),
+    notify    : ko.observable( false ),
+    alert     : ko.observable( false ),
+    noText    : ko.observable( null ),
+    yesText   : ko.observable( null ),
+    closeText : ko.observable( null ),
+    modalClass: ko.observable( null ),
+    callback  : null,
+
+    init: function ( options, callback ) {
+        var vm = dbo.tellmeModel;
+
+        vm.callback = callback;
+
+        vm.setOptions( options );
+
+        $( "#tell-me" ).modal({
+            show:true
+        } );
+    },
+
+    setOptions: function ( options ) {
+        var vm = dbo.tellmeModel;
+
+        vm.title( options.title || '' );
+        vm.message( options.message || '' );
+        vm.notify( options.notify || false );
+        vm.noText( options.noText || 'Nee' );
+        vm.yesText( options.yesText || 'Ja' );
+        vm.closeText( options.closeText || 'ok' );
+        vm.modalClass( options.modalClass || 'modal-primary' )
+    },
+
+    closeNo: function () {
+        var vm = dbo.tellmeModel;
+        if ( typeof( vm.callback ) == 'function' ) vm.callback( false );
+        vm.closeTellme();
+    },
+
+    closeYes: function () {
+        var vm = dbo.tellmeModel;
+        if ( typeof( vm.callback ) == 'function' ) vm.callback( true );
+        vm.closeTellme();
+    },
+
+    closeOk: function () {
+        var vm = dbo.tellmeModel;
+        if ( typeof( vm.callback ) == 'function' ) vm.callback();
+        vm.closeTellme();
+    },
+
+    close: function () {
+        var vm = dbo.tellmeModel;
+        if ( typeof( vm.callback ) == 'function' ) vm.callback();
+    },
+
+    closeTellme: function(){
+        $( "#tell-me" ).modal( 'hide');
+    }
+
+
+}
+
+ko.applyBindings( dbo.tellmeModel, document.getElementById( "tell-me" ) );
+
+
+$(document).on('show.bs.modal', '.modal', function (event) {
+    var zIndex = 1040 + (10 * $('.modal:visible').length);
+    $(this).css('z-index', zIndex);
+    setTimeout(function() {
+        $('.modal-backdrop').not('.modal-stack').css('z-index', zIndex - 1).addClass('modal-stack');
+    }, 0);
+});
+