#41 Fixing missing removed code after reverting usage of user dao