Closes Welcome Page Loop Hole
More work on #4