diff --git a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
index 4de88b7277..8420d8db68 100644
--- a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
@@ -150,7 +150,7 @@ namespace Umbraco.Core.Persistence.Repositories
         public IProfile GetProfileByUserName(string username)
         {
             var sql = GetBaseQuery(false);
-            sql.Where(GetBaseWhereClause(), new { Username = username });
+            sql.Where("umbracoUser.userLogin = @Username", new { Username = username });
 
             var dto = Database.FirstOrDefault<UserDto>(sql);
 
@@ -163,7 +163,7 @@ namespace Umbraco.Core.Persistence.Repositories
         public IUser GetUserByUserName(string username)
         {
             var sql = GetBaseQuery(false);
-            sql.Where(GetBaseWhereClause(), new { Username = username });
+            sql.Where("umbracoUser.userLogin = @Username", new { Username = username });
 
             var dto = Database.FirstOrDefault<UserDto>(sql);
             
diff --git a/src/Umbraco.Web.UI.Client/build/belle/views/common/application.controller.js b/src/Umbraco.Web.UI.Client/build/belle/views/common/application.controller.js
index 9e94927ee3..e94b637abf 100644
--- a/src/Umbraco.Web.UI.Client/build/belle/views/common/application.controller.js
+++ b/src/Umbraco.Web.UI.Client/build/belle/views/common/application.controller.js
@@ -84,8 +84,8 @@ angular.module('umbraco').controller("MainController",
 
     //set properties
     $scope.authenticated = userService.authenticated;
-    $scope.login = "Hello";
-    $scope.password = "World";
+    $scope.login = "";
+    $scope.password = "";
 
     $scope.signin = function () {
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
index 292ef1bb55..0f2bc3b15d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
@@ -6,8 +6,8 @@
 function authResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
     /** internal method to get the api url */
-    function getLoginUrl() {
-        return Umbraco.Sys.ServerVariables.authenticationApiBaseUrl + "PostLogin";
+    function getLoginUrl(username, password) {
+        return Umbraco.Sys.ServerVariables.authenticationApiBaseUrl + "PostLogin?username=" + username + "&password=" + password;
     }
     
 
@@ -16,7 +16,7 @@ function authResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
             var deferred = $q.defer();
             //send the data
-            $http.post(getLoginUrl(), {username: username, password: password}).
+            $http.post(getLoginUrl(username, password)).
                 success(function (data, status, headers, config) {                    
                     deferred.resolve(data);
                     
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
index 6b949341ad..606d0465c4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
@@ -40,7 +40,7 @@ angular.module('umbraco.services')
         logout: function () {
             $rootScope.$apply(function () {
                 authenticated = false;
-                jQuery.cookie('authed', null);
+                jQuery.cookie('UMB_UCONTEXT', null);
                 currentUser = undefined;
             });
         },
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index 09fae93e8f..6b08afb220 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Editors
     /// </summary>
     [PluginController("UmbracoApi")]
     [ValidationFilter]
-    public class AuthenticationController : UmbracoAuthorizedApiController
+    public class AuthenticationController : UmbracoApiController
     {
         private readonly UserModelMapper _userModelMapper;