Merge "Fix UserController to not throw in stopUser"