Fixes part of #68 and more

Hi,

aaa22d0: Fixes part of the #68, with this little patch the error doesn't appear.

eeede18: Fixed strange situation on login_links that overlap between them in other language than english.