FS-28: Made the UserLocker a bit more stable.