Touch up to new user and isUnique function