Joe

Merging user registration