Add ace mode + Fix new user