move mapification to one place, fix user registration