move check user to correct place