3 import bugs from securesync.users => facility refactoring