Fix double home page bug

Implemented #3015 manually to avoid conflicts. Thanks @huglester.