Task #255: Change checking if user already registered.
Merge branch '255' into test