prevent renamed users from being locked out after a failed rename

@owend @Wikia/platform-team 
https://wikia-inc.atlassian.net/browse/PLATFORM-420