Fix getting user shell error message (/etc/passwd no longer makes sense)
Merge pull request #2297 from Ch00k/master

Fix getting user shell error message (/etc/passwd no longer makes sense)