Fix Alert and User