Redmine #5781: Users promises fixes