Real fix logout Firefox
Merge amend