fixes #9; unify user forms