additional fixes, storing state before eliminating login screen