variable name change and logout fix