diff --git a/Fuchs/Controllers/IntranetController.cs b/Fuchs/Controllers/IntranetController.cs
index 16b594c..8149f6c 100644
--- a/Fuchs/Controllers/IntranetController.cs
+++ b/Fuchs/Controllers/IntranetController.cs
@@ -249,16 +249,16 @@ public partial class IntranetController : Microsoft.AspNetCore.Mvc.Controller
         _logger.LogDebug("HandleLogin attempt for email={Email} ip={IP}",
             email, HttpContext.Connection.RemoteIpAddress);
         var row = await _intranet.AuthenticateAsync(email, password);
-        if (row == null)
+        string userId = row?.nz("useraccount_id") ?? "";
+        if (row == null || string.IsNullOrEmpty(userId))
         {
             _logger.LogWarning("Login failed for email={Email} ip={IP}",
                 email, HttpContext.Connection.RemoteIpAddress);
             return Unauthorized401();
         }
 
-        string userId = row.nz("useraccount_id");
         string userEmail = row.nz("email");
-        int auth = int.TryParse(row.nz("authorization"), out var a) ? a : 0;
+        int auth = int.TryParse(row.nz("auth"), out var a) ? a : 0;
 
         var identity  = FuchsUserIdentity.BuildIdentity(userId, userEmail, auth, Fuchs_intranet.AuthScheme);
         var principal = new System.Security.Claims.ClaimsPrincipal(identity);
diff --git a/Fuchs_Database/dbo/Functions/fis_admin_getUserAccount.sql b/Fuchs_Database/dbo/Functions/fis_admin_getUserAccount.sql
index b409a59..9221219 100644
--- a/Fuchs_Database/dbo/Functions/fis_admin_getUserAccount.sql
+++ b/Fuchs_Database/dbo/Functions/fis_admin_getUserAccount.sql
@@ -36,19 +36,22 @@ BEGIN
 						(SELECT ',' + [value] as [text()] FROM [fis_useraccounts_settings] WHERE [useraccount_id] = @useraccount_id and [key] = 'intranet_function' FOR XML PATH(''), TYPE).value('.','nvarchar(max)')
 					, 1,1,'');
 
-	INSERT INTO @RET 
-		VALUES( 
-				 @useraccount_id
-				,IIF(@useraccount_id is null, -1, @auth)
-				,IIF(@useraccount_id is null, null, @name)
-				,IIF(@useraccount_id is null, null, @firstname)
-				,IIF(@useraccount_id is null, null, @email)
-				,IIF(@useraccount_id is null, null, @mobile)
-				,IIF(@useraccount_id is null, null, @functions)
-				,IIF(@useraccount_id is null, null, @language)
-				,IIF(@useraccount_id is null, null, @fullname)
-				,IIF(@useraccount_id is null, null, @fullname_rev)
-			  );
+	IF @useraccount_id IS NOT NULL
+	BEGIN
+		INSERT INTO @RET
+			VALUES(
+					 @useraccount_id
+					,@auth
+					,@name
+					,@firstname
+					,@email
+					,@mobile
+					,@functions
+					,@language
+					,@fullname
+					,@fullname_rev
+				  );
+	END
 
 	RETURN;