Changed conditional fallback to default value in register process