Better to re-confirm with the immigration department personally.

You can go to Madinat Khalifa, Gate 3 and meet the front desk officer who will be of great help. Its my experience.
All the best.