diff --git a/clientapi/routing/sso.go b/clientapi/routing/sso.go
index 154b7e93d..34accda1f 100644
--- a/clientapi/routing/sso.go
+++ b/clientapi/routing/sso.go
@@ -224,7 +224,7 @@ func SSOCallback(
 		if localpart == "" {
 			util.GetLogger(ctx).WithField("ssoIdentifier", result.Identifier).Info("no suggested user ID from SSO provider")
 			var res uapi.QueryNumericLocalpartResponse
-			if err := userAPI.QueryNumericLocalpart(ctx, &res); err != nil {
+			if err = userAPI.QueryNumericLocalpart(ctx, &res); err != nil {
 				util.GetLogger(ctx).WithError(err).WithField("ssoIdentifier", result.Identifier).Error("failed to generate numeric localpart")
 				return jsonerror.InternalServerError()
 			}
diff --git a/userapi/storage/storage_test.go b/userapi/storage/storage_test.go
index 0308c847b..c4ca0c2ff 100644
--- a/userapi/storage/storage_test.go
+++ b/userapi/storage/storage_test.go
@@ -466,6 +466,7 @@ func Test_SSO(t *testing.T) {
 		t.Log("Retrieve localpart for association")
 
 		gotLocalpart, err := db.GetLocalpartForSSO(ctx, ns, issuer, subject)
+		assert.NoError(t, err, "unable to get localpart for SSO subject")
 		assert.Equal(t, aliceLocalpart, gotLocalpart)
 
 		t.Log("Remove SSO association")