Supporting new account activation setting, code cleanup, new screenshots