Change to temporary user if vs login handling.
Merge pull request #174 from richard-willowit/version80

Change to temporary user if vs login handling.