Forced commit.
Previous commit improved use of login_cap database. This can probably be further improved.