fixed user class for proper login handling
final merge of joe and I