Hack for user-not-found slightly improved