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