Fixed issues with firsttimeuse