Fix an issue with settings not properly being saved caused by previous commit and also update the terms text
Fix the tab indexes in the login form