Merge pull request #977 from tarunc/acct-security-form

Fixing OTP Form
Merge remote-tracking branch 'upstream/master' into otp-stuff