diff --git a/frontend/ui/networkmgr.lua b/frontend/ui/networkmgr.lua
index ea55b2d01..27a932899 100644
--- a/frontend/ui/networkmgr.lua
+++ b/frontend/ui/networkmgr.lua
@@ -38,11 +38,17 @@ local function koboEnableWifi(toggle)
     end
 end
 
+local function pocketbookEnableWifi(toggle)
+    os.execute("/ebrmain/bin/netagent " .. (toggle == 1 and "connect" or "disconnect"))
+end
+
 function NetworkMgr:turnOnWifi()
     if Device:isKindle() then
         kindleEnableWifi(1)
     elseif Device:isKobo() then
         koboEnableWifi(1)
+    elseif Device:isPocketBook() then
+        pocketbookEnableWifi(1)
     end
 end
 
@@ -51,6 +57,8 @@ function NetworkMgr:turnOffWifi()
         kindleEnableWifi(0)
     elseif Device:isKobo() then
         koboEnableWifi(0)
+    elseif Device:isPocketBook() then
+        pocketbookEnableWifi(0)
     end
 end
 
diff --git a/plugins/evernote.koplugin/main.lua b/plugins/evernote.koplugin/main.lua
index 2b2ba8c22..2734c167c 100644
--- a/plugins/evernote.koplugin/main.lua
+++ b/plugins/evernote.koplugin/main.lua
@@ -126,6 +126,9 @@ function EvernoteExporter:addToMainMenu(tab_item_table)
 end
 
 function EvernoteExporter:login()
+    if NetworkMgr:getWifiStatus() == false then
+        NetworkMgr:promptWifiOn()
+    end
     self.login_dialog = LoginDialog:new{
         title = self.login_title,
         username = self.evernote_username or "",
@@ -185,10 +188,7 @@ function EvernoteExporter:doLogin(username, password)
     self.evernote_username = username
     local ok, token = pcall(oauth.getToken, oauth)
     -- prompt users to turn on Wifi if network is unreachable
-    if not ok and token and token:find("Network is unreachable") then
-        NetworkMgr:promptWifiOn()
-        return
-    elseif not ok and token then
+    if not ok and token then
         UIManager:show(InfoMessage:new{
             text = _("An error occurred while logging in:") .. "\n" .. token,
         })