diff --git a/app/src/main/java/com/etesync/syncadapter/NotificationHelper.java b/app/src/main/java/com/etesync/syncadapter/NotificationHelper.java
index bbc08c8c..e165a3d9 100644
--- a/app/src/main/java/com/etesync/syncadapter/NotificationHelper.java
+++ b/app/src/main/java/com/etesync/syncadapter/NotificationHelper.java
@@ -13,6 +13,7 @@ import android.support.v7.app.NotificationCompat;
 import com.etesync.syncadapter.journalmanager.Exceptions;
 import com.etesync.syncadapter.ui.AccountSettingsActivity;
 import com.etesync.syncadapter.ui.DebugInfoActivity;
+import com.etesync.syncadapter.ui.WebViewActivity;
 
 import java.util.logging.Level;
 
@@ -95,7 +96,7 @@ public class NotificationHelper {
             if (e instanceof Exceptions.UnauthorizedException) {
                 detailsIntent = new Intent(this, AccountSettingsActivity.class);
             } else if (e instanceof Exceptions.UserInactiveException) {
-                startActivity(new Intent(Intent.ACTION_VIEW, Constants.dashboard));
+                WebViewActivity.openUrl(this, Constants.dashboard);
                 return;
             } else {
                 detailsIntent = new Intent(this, DebugInfoActivity.class);
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.java
index 75a13488..7f02f241 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.java
+++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.java
@@ -93,10 +93,10 @@ public class AccountsActivity extends AppCompatActivity implements NavigationVie
                 startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri));
                 break;
             case R.id.nav_guide:
-                startActivity(new Intent(Intent.ACTION_VIEW, Constants.helpUri));
+                WebViewActivity.openUrl(this, Constants.helpUri);
                 break;
             case R.id.nav_faq:
-                startActivity(new Intent(Intent.ACTION_VIEW, Constants.faqUri));
+                WebViewActivity.openUrl(this, Constants.faqUri);
                 break;
             case R.id.nav_report_issue:
                 startActivity(new Intent(Intent.ACTION_VIEW, Constants.reportIssueUri));
@@ -110,5 +110,4 @@ public class AccountsActivity extends AppCompatActivity implements NavigationVie
         drawer.closeDrawer(GravityCompat.START);
         return true;
     }
-
 }
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.java
index 6ad9c74a..7ad6589f 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.java
+++ b/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.java
@@ -22,15 +22,16 @@ import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
 import com.etesync.syncadapter.BuildConfig;
 import com.etesync.syncadapter.Constants;
 import com.etesync.syncadapter.R;
 import com.etesync.syncadapter.model.ServiceDB;
 import com.etesync.syncadapter.model.Settings;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
 import lombok.Cleanup;
 
 public class StartupDialogFragment extends DialogFragment {
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.java
index c955b283..a5cda9f7 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.java
+++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.java
@@ -17,6 +17,7 @@ import android.view.MenuItem;
 import com.etesync.syncadapter.App;
 import com.etesync.syncadapter.Constants;
 import com.etesync.syncadapter.R;
+import com.etesync.syncadapter.ui.WebViewActivity;
 
 /**
  * Activity to initially connect to a server and create an account.
@@ -71,6 +72,6 @@ public class LoginActivity extends AppCompatActivity {
     }
 
     public void showHelp(MenuItem item) {
-        startActivity(new Intent(Intent.ACTION_VIEW, Constants.helpUri));
+        WebViewActivity.openUrl(this, Constants.helpUri);
     }
 }
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java
index 267069c6..974b5ea7 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java
+++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java
@@ -21,6 +21,7 @@ import android.widget.EditText;
 
 import com.etesync.syncadapter.Constants;
 import com.etesync.syncadapter.R;
+import com.etesync.syncadapter.ui.WebViewActivity;
 import com.etesync.syncadapter.ui.widget.EditPassword;
 
 public class LoginCredentialsFragment extends Fragment {
@@ -53,8 +54,7 @@ public class LoginCredentialsFragment extends Fragment {
             @Override
             public void onClick(View v) {
                 Uri createUri = Constants.registrationUrl.buildUpon().appendQueryParameter("email", editUserName.getText().toString()).build();
-                Intent intent = new Intent(Intent.ACTION_VIEW, createUri);
-                startActivity(intent);
+                WebViewActivity.openUrl(getContext(), createUri);
             }
         });