When restoring old users, account for the server which conerted all - to _
When restoring old users, account for the server which conerted all - to _

prathamesh-sonpatki/frontend,circleci/frontend,RayRutjes/frontend,circleci/frontend,RayRutjes/frontend,circleci/frontend,prathamesh-sonpatki/frontend