Fixing bug for user edition