this shoud fix user duplication bug introduced in the last commit - sorry