added security question stuff to registerButton handler
Merge branch 'master' into heidi