diff --git a/clientapi/admin_test.go b/clientapi/admin_test.go
index 160fe8f3..51a9dfba 100644
--- a/clientapi/admin_test.go
+++ b/clientapi/admin_test.go
@@ -1562,7 +1562,7 @@ func TestAdminCheckUsernameAvailable(t *testing.T) {
 				}
 
 				// Nothing more to check, test is done.
-				if tc.wantOK {
+				if !tc.wantOK {
 					return
 				}
 
diff --git a/setup/monolith.go b/setup/monolith.go
index b61633c1..915446fe 100644
--- a/setup/monolith.go
+++ b/setup/monolith.go
@@ -93,7 +93,7 @@ type UserVerifierProvider struct {
 }
 
 func (u *UserVerifierProvider) VerifyUserFromRequest(req *http.Request) (*userapi.Device, *util.JSONResponse) {
-	return u.VerifyUserFromRequest(req)
+	return u.UserVerifier.VerifyUserFromRequest(req)
 }
 
 func NewUserVerifierProvider(userVerifier httputil.UserVerifier) *UserVerifierProvider {
diff --git a/userapi/api/api.go b/userapi/api/api.go
index 31059f5a..ec3ae5f3 100644
--- a/userapi/api/api.go
+++ b/userapi/api/api.go
@@ -32,7 +32,7 @@ type UserInternalAPI interface {
 
 	QuerySearchProfilesAPI // used by p2p demos
 	QueryExternalUserIDByLocalpartAndProvider(ctx context.Context, externalID, authProvider string) (*LocalpartExternalID, error)
-	PerformLocalpartExternalUserIDCreation(ctx context.Context, localpart, externalID, authProvider string) (error)
+	PerformLocalpartExternalUserIDCreation(ctx context.Context, localpart, externalID, authProvider string) error
 }
 
 // api functions required by the appservice api
@@ -667,6 +667,7 @@ type QueryAccountByLocalpartRequest struct {
 type QueryAccountByLocalpartResponse struct {
 	Account *Account
 }
+
 // API functions required by the clientapi
 type ClientKeyAPI interface {
 	UploadDeviceKeysAPI