Fix curretn user bugs