switch user problem almost fixed

I believe the last issue is a timing one which will be narrowed down.