OF-754: Lock out user option works incorrectly in some cases
Merge pull request #79 from Redor/openfire

OF-754: Lock out user option works incorrectly in some cases