Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -r14726 -r14728
--- branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14726)
+++ branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14728)
@@ -2220,4 +2220,18 @@
 
 UPDATE BanRules
 SET ItemField = 'Username'
-WHERE ItemField = 'Login';
\ No newline at end of file
+WHERE ItemField = 'Login';
+
+DELETE FROM Phrase
+WHERE PhraseKey IN (
+	'LU_USERNAME', 'LU_EMAIL', 'LU_PASSWORD', 'LA_TEXT_LOGIN', 'LA_PROMPT_PASSWORD',
+	'LA_USE_EMAILS_AS_LOGIN', 'LU_USER_AND_EMAIL_ALREADY_EXIST', 'LU_ENTERFORGOTEMAIL'
+);
+
+UPDATE ConfigurationValues
+SET VariableName = 'RegistrationUsernameRequired', Prompt = 'la_config_RegistrationUsernameRequired'
+WHERE VariableName = 'Email_As_Login';
+
+UPDATE ConfigurationValues
+SET VariableValue = IF(VariableValue = 1, 0, 1)
+WHERE VariableName = 'RegistrationUsernameRequired';
