diff --git a/app/login.go b/app/login.go
index 16cc2d515f..bd63787546 100644
--- a/app/login.go
+++ b/app/login.go
@@ -63,6 +63,7 @@ func (a *App) AuthenticateUserForLogin(c *request.Context, id, loginId, password
 	if user, err = a.GetUserForLogin(id, loginId); err != nil {
 		return nil, err
 	}
+
 	// CWS login allow to use the one-time token to login the users when they're redirected to their
 	// installation for the first time
 	if IsCWSLogin(a, cwsToken) {
diff --git a/model/feature_flags.go b/model/feature_flags.go
index 8bce7a1a88..ae1005b30d 100644
--- a/model/feature_flags.go
+++ b/model/feature_flags.go
@@ -76,8 +76,6 @@ type FeatureFlags struct {
 	ThreadsEverywhere bool
 
 	GlobalDrafts bool
-
-	UrlMappingForCWS bool
 }
 
 func (f *FeatureFlags) SetDefaults() {
@@ -107,7 +105,6 @@ func (f *FeatureFlags) SetDefaults() {
 	f.ReduceOnBoardingTaskList = false
 	f.ThreadsEverywhere = false
 	f.GlobalDrafts = false
-	f.UrlMappingForCWS = false
 }
 
 func (f *FeatureFlags) Plugins() map[string]string {