sorry apower3000 i was away, and yes after the 2 years u can enter qatar as u wish (as an employee) but really this isn't practical in your case, the best way as Lady Di said is to ask for adjustment, or else u will go for legal struggle with your employer which might end for his favor.