Added a wait cycle to user add / check loop