Feature/start eip after logging in #6096