If you have took the application form from near Madinat Khalifa Immigration office typing center then you have the correct application form because I also did the same and got the visa successfully.