Transferring changes in get_user() to feature (orig in stable)

Looks like there was also some extra white space that Notepad++ nuked :smile: