Feature Request #1513 - Add User Form Fields Fix

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>