Already coded and commited the location flag. Please test and let me know if everything is OK.
Regarding the department, we could leave it as is now, as defaulting it will not prevent user doing requests from not allowed departments. i will think more about it, see if there is another option available...