Keyboard choice at login

I've got a macbook with an azerty keyboard, but my system is in English (UK).

For the past month, ever since the battery got replaced, every time I try to login, the system thinks my keyboard is "ABC" (i.e, qwerty), so every time I've got to first update the keyboard on the upper right menu (to "ABC-AZERTY") then login (it's much easier when you want to type your password that if you press "a" you send an "a", not a "q" ;) )

Any idea how to set up the login keyboard once for all?