Updated processing from server side so that login and account creation work
Merging stuff