Fixed a runtime error when user logged on

Signed-off-by: wpenson <wade7368@gmail.com>
Merge remote-tracking branch 'origin/master'