Fix for registration and main page