Feature Request #1513 - Add User Form Fields Fix

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
Merge pull request #1016 from D-storm/FR-1513

Feature Request #1513