Fixed issue where welcome message was shown everytime