This pull request includes a revert

Because I didn't like having the password textctl on the massive tab. Paul agrees its ok to remove it.