Fixes #1600.  Also fixes an issue where the user's password would disappear after scrolling the view in landscape orientation.