fix nil related error on edit account page

Conflicts:
	app/views/spree/shared/_user_form.html.erb