Re: #1311 - removed user check - wrong fix