Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/HomeController.cs
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/HomeController.cs	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/HomeController.cs	(revision 13862)
@@ -20,10 +20,12 @@
 #endregion
 
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
+
 using Microsoft.AspNetCore.Mvc;
 using System.ServiceModel.Security;
 using System;
+using Microsoft.AspNetCore.Http;
+using HeuristicLab.Clients.Hive.WebJobManager.Services;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
-using Microsoft.AspNetCore.Http;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
@@ -100,5 +102,5 @@
                     {
                         ViewBag.Title = "Login succesful";
-                        weblog.newLoginOKBOnly(model,q);
+                        weblog.newLoginOKBOnly(model,q, password);
                         HttpContext.Session.SetString("UserId", model.userId.ToString());
                         return RedirectToAction("Index", "Query");
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/JobController.cs
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/JobController.cs	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/JobController.cs	(revision 13862)
@@ -20,20 +20,19 @@
 #endregion
 
+using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
+using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
+using HeuristicLab.Common;
+using HeuristicLab.Optimization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using Microsoft.Net.Http.Headers;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
-using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
-using Microsoft.AspNetCore.Http;
-
-using System.IO;
-using Microsoft.Net.Http.Headers;
-using Microsoft.AspNetCore.Hosting;
-using HeuristicLab.Common;
-using HeuristicLab.Optimization;
-using System.Threading;
-
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/OkbManagementController.cs
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/OkbManagementController.cs	(revision 13862)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/OkbManagementController.cs	(revision 13862)
@@ -0,0 +1,49 @@
+﻿using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
+using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+
+namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
+{
+    public class OkbManagementController: Controller
+    {
+        private OkbManagementVM vm;
+        private WebLoginService weblog;
+        private Guid userId;
+        
+        private bool init()
+        {
+            var u = HttpContext.Session.GetString("UserId");
+            weblog = WebLoginService.Instance;
+            if (u == null || u == "" || Guid.Parse(u) == Guid.Empty)
+            {
+                return false;
+            }
+            else
+            {
+                userId = Guid.Parse(u);
+                vm = new OkbManagementVM(weblog.getCurrentUser(userId), weblog.getOkbAdminClient(userId));
+                if(vm.client != null)
+                    return true;
+            }
+            return false;
+        }
+
+        public IActionResult Index()
+        {
+
+            if (init())
+            {
+                ViewBag.SessionId = HttpContext.Session.GetString("UserId");
+                ViewBag.Title = "OKB Management";
+                return View("Index", vm);
+            }
+            else
+            {
+                return RedirectToAction("Index", "Query");
+            }
+        }
+    }
+}
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/QueryController.cs
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/QueryController.cs	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/QueryController.cs	(revision 13862)
@@ -21,4 +21,5 @@
 
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
 using Microsoft.AspNetCore.Http;
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/ResourceController.cs
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/ResourceController.cs	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/ResourceController.cs	(revision 13862)
@@ -20,7 +20,7 @@
 #endregion
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Models;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs	(revision 13862)
@@ -20,6 +20,6 @@
 #endregion
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels.User;
 using Microsoft.AspNetCore.Hosting;
@@ -27,9 +27,4 @@
 using Microsoft.AspNetCore.Mvc;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.ServiceModel.Security;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
@@ -191,5 +186,8 @@
                     accessClient.addMember(user, group);
                 }
-                return RedirectToAction("SelectUser", new { id = uid.ToString() });
+                if (uid != Guid.Empty && uid == weblog.getCurrentUser(userId).currentUser.Id)
+                    return RedirectToAction("Index", "Home");//Logout if current user
+                else
+                    return RedirectToAction("SelectUser", new { id = uid.ToString() });
             }
             else
