diff --git a/api/logic/minecraft/auth/MojangAccount.cpp b/api/logic/minecraft/auth/MojangAccount.cpp
index f4c628a6..08047438 100644
--- a/api/logic/minecraft/auth/MojangAccount.cpp
+++ b/api/logic/minecraft/auth/MojangAccount.cpp
@@ -170,8 +170,7 @@ AccountStatus MojangAccount::accountStatus() const
 		return Verified;
 }
 
-std::shared_ptr<YggdrasilTask> MojangAccount::login(AuthSessionPtr session,
-													QString password)
+std::shared_ptr<YggdrasilTask> MojangAccount::login(AuthSessionPtr session, QString password)
 {
 	Q_ASSERT(m_currentTask.get() == nullptr);
 
@@ -186,18 +185,28 @@ std::shared_ptr<YggdrasilTask> MojangAccount::login(AuthSessionPtr session,
 		return nullptr;
 	}
 
-	if (password.isEmpty())
+	if(accountStatus() == Verified && !session->wants_online)
 	{
-		m_currentTask.reset(new RefreshTask(this));
+		session->status = AuthSession::PlayableOffline;
+		session->auth_server_online = false;
+		fillSession(session);
+		return nullptr;
 	}
 	else
 	{
-		m_currentTask.reset(new AuthenticateTask(this, password));
-	}
-	m_currentTask->assignSession(session);
+		if (password.isEmpty())
+		{
+			m_currentTask.reset(new RefreshTask(this));
+		}
+		else
+		{
+			m_currentTask.reset(new AuthenticateTask(this, password));
+		}
+		m_currentTask->assignSession(session);
 
-	connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded()));
-	connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString)));
+		connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded()));
+		connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString)));
+	}
 	return m_currentTask;
 }
 
diff --git a/application/LaunchController.cpp b/application/LaunchController.cpp
index 70b71eaf..2e711933 100644
--- a/application/LaunchController.cpp
+++ b/application/LaunchController.cpp
@@ -22,12 +22,6 @@ LaunchController::LaunchController(QObject *parent) : Task(parent)
 }
 
 void LaunchController::executeTask()
-{
-	login();
-}
-
-// FIXME: minecraft specific
-void LaunchController::login()
 {
 	if (!m_instance)
 	{
@@ -35,6 +29,12 @@ void LaunchController::login()
 		return;
 	}
 
+	login();
+}
+
+// FIXME: minecraft specific
+void LaunchController::login()
+{
 	JavaCommon::checkJVMArgs(m_instance->settings()->get("JvmArgs").toString(), m_parentWidget);
 
 	// Find an account to use.