Reinstate 'user' config option

Add 'user=' back into the config file
Add newlines for some error messages