Added checking for existing user