Fixed issue that lead to duplicate users