diff --git a/api/tacticalrmm/accounts/views.py b/api/tacticalrmm/accounts/views.py index 3f60cb17..8f2a601b 100644 --- a/api/tacticalrmm/accounts/views.py +++ b/api/tacticalrmm/accounts/views.py @@ -125,12 +125,17 @@ class LoginViewV2(KnoxLoginView): ) response = super().post(request, format=None) response.data["username"] = request.user.username - if request.user.first_name and request.user.last_name: - response.data["name"] = ( - f"{request.user.first_name} {request.user.last_name}" - ) - else: - response.data["name"] = None + + response.data["name"] = None + + if request.user.is_sso_user: + if request.user.first_name and request.user.last_name: + response.data["name"] = ( + f"{request.user.first_name} {request.user.last_name}" + ) + elif request.user.first_name: + response.data["name"] = request.user.first_name + return Response(response.data) else: AuditLog.audit_user_failed_twofactor(