refactor: sort out form users into a partial