fix user_params if params[:user].nil?

Also only overwrite the user email address if it is actually set
in the session.
Merge pull request #17 from azul/bugfix/6691-fix-user-creation

fix user_params if params[:user].nil?