Re #152: Correct merged code.
Re #152: Disable login with username.