Fixes #6374 Make sure top menu URLs are generated properly based on user preferences , refs #3426