fixed login links stuff
Merge branch 'bootstrap_vip' of github.com:m-isabel/vip into bootstrap_vip