diff --git a/editor/osm_auth.cpp b/editor/osm_auth.cpp
index 6506c0ce3c..2985b733be 100644
--- a/editor/osm_auth.cpp
+++ b/editor/osm_auth.cpp
@@ -338,6 +338,7 @@ bool OsmOAuth::ResetPassword(string const & email) const
   HttpClient request(m_baseUrl + kForgotPasswordUrlPart);
   request.SetBodyData(std::move(params), "application/x-www-form-urlencoded");
   request.SetCookies(sid.m_cookies);
+  request.SetHandleRedirects(false);
 
   if (!request.RunHttpRequest())
     MYTHROW(NetworkError, ("ResetPassword Network error while connecting to", request.UrlRequested()));
diff --git a/platform/http_session_manager.mm b/platform/http_session_manager.mm
index ec8d748b01..3a9940f22e 100644
--- a/platform/http_session_manager.mm
+++ b/platform/http_session_manager.mm
@@ -111,7 +111,7 @@
   if ([taskInfo.delegate
        respondsToSelector:@selector(URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:)])
   {
-    dispatch_async(dispatch_get_main_queue(), ^{
+    dispatch_async(dispatch_get_current_queue(), ^{
       [taskInfo.delegate URLSession:session
                                 task:task
           willPerformHTTPRedirection:response
@@ -134,7 +134,7 @@
 
   if ([taskInfo.delegate respondsToSelector:@selector(URLSession:task:didCompleteWithError:)])
   {
-    dispatch_async(dispatch_get_main_queue(), ^{
+    dispatch_async(dispatch_get_current_queue(), ^{
       [taskInfo.delegate URLSession:session task:task didCompleteWithError:error];
     });
   }
@@ -149,7 +149,7 @@
   if ([taskInfo.delegate
           respondsToSelector:@selector(URLSession:dataTask:didReceiveResponse:completionHandler:)])
   {
-    dispatch_async(dispatch_get_main_queue(), ^{
+    dispatch_async(dispatch_get_current_queue(), ^{
       [taskInfo.delegate URLSession:session
                            dataTask:dataTask
                  didReceiveResponse:response
@@ -169,7 +169,7 @@
   DataTaskInfo * taskInfo = [self taskInfoForTask:dataTask];
   if ([taskInfo.delegate respondsToSelector:@selector(URLSession:dataTask:didReceiveData:)])
   {
-    dispatch_async(dispatch_get_main_queue(), ^{
+    dispatch_async(dispatch_get_current_queue(), ^{
       [taskInfo.delegate URLSession:session dataTask:dataTask didReceiveData:data];
     });
   }