Fixes bugs (not in a neat way)
Fixes the login errors
Two others are still left
Merge branch 'adduser' into fix_addusers

Conflicts:
	features/step_definitions/login_steps.rb