Fixes Issue 367
"Change current user" now correctly works