|#1030| Fixing one more nasty bug related to verifying user