fixed user logic