Better error message than 'as_user_no_password'.
Merge in default.
Merged bug25570 into default