Air France, part of the Franco-Dutch group Air France-KLM, is preparing to restart flights to Tehran from April 17 after an eight-year hiatus due to sanctions.
After a meeting between Air France management and unions on Monday, the French carrier said it would offer female staff the choice of opting out of the flights.
Under Iranian law, women must cover their hair in public places. Unions had raised concerns over an Air France ruling obliging female crew to wear a headscarf on leaving a plane.
The debate on the wearing of headscarves and other religious symbols in public is particularly heated in France, which attaches importance to the separation of state and religious institutions.
"This obligation does not apply during the flight and is respected by all international airlines serving the Republic of Iran," Air France said in a statement on Monday.
A spokeswoman for British Airways, part of International Consolidated Airlines Group, which is planning to restart flights to Iran from Heathrow on July 14, said it would make recommendations to its crew nearer the time.
Germany's Lufthansa, which continued to fly to Tehran throughout the sanctions, said it had not experienced any problems and that crew followed the rules to cover up when in public spaces.
Nicoley Baublies, head of Lufthansa's main cabin crew union, said some crew members had raised concerns, but not to the extent seen at Air France.
