fix form handlers

Signed-off-by: Scott Savarie <scottsavarie@gmail.com>
Merge branch 'refs/heads/Development'