diff --git a/src/views/network.html b/src/views/network.html
index caeff4a4f..bae5043a9 100644
--- a/src/views/network.html
+++ b/src/views/network.html
@@ -3,16 +3,20 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Configure SysInfo Backend</h4>
+        <h4 class="modal-title">Configure IP Provider</h4>
       </div>
       <div class="modal-body">
         <form name="sysinfoForm" role="form" novalidate ng-submit="sysinfo.submit()" autocomplete="off">
           <fieldset>
             <div class="form-group">
-              <label class="control-label">Backend  <sup><a href="https://cloudron.io/documentation/domains/#sysinfo" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+              <label class="control-label">Provider  <sup><a href="https://cloudron.io/documentation/domains/#sysinfo" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
               <select class="form-control" ng-model="sysinfo.newProvider" ng-options="a.value as a.name for a in sysinfoProvider"></select>
             </div>
 
+            <div ng-show="sysinfo.newProvider === 'generic'">
+                The Public IP address of the server will be <a href="https://api.cloudron.io/api/v1/helper/public_ip" target="_blank">automatically detected</a>.
+            </div>
+
             <!-- Fixed -->
             <div class="form-group" ng-show="sysinfo.newProvider === 'fixed'" ng-class="{ 'has-error': (!sysinfoForm.ip.$dirty && sysinfo.error.ip) }">
               <label class="control-label">IP Address</label>
@@ -46,36 +50,49 @@
   </div>
 
   <div class="text-left">
-    <h3>SysInfo / IP Address</h3>
+    <h3>IP Address</h3>
   </div>
 
   <div class="card">
     <div class="row">
-      <div class="col-md-12">
-        <p>
-          To automatically setup DNS records, Cloudron needs to know which IP address should be used.
-        </p>
-        <table>
-          <tr>
-            <td class="text-bold" style="vertical-align: top; width: 200px;">Current Backend</td>
-            <td class="text-right" style="vertical-align: top;">{{ prettySysinfoProviderName(sysinfo.provider) }}</td>
-          </tr>
-          <tr ng-show="sysinfo.ip">
-            <td class="text-bold" style="vertical-align: top;">IP Address</td>
-            <td class="text-right" style="vertical-align: top;">{{ sysinfo.ip }}</td>
-          </tr>
-          <tr ng-show="sysinfo.ifname">
-            <td class="text-bold" style="vertical-align: top;">Network Interface Name</td>
-            <td class="text-right" style="vertical-align: top;">{{ sysinfo.ifname }}</td>
-          </tr>
-        </table>
-        </p>
+      <div class="col-xs-12">
+        Cloudron uses this IP address when setting up DNS records.
       </div>
     </div>
 
+    <br/>
+    <div class="row">
+      <div class="col-xs-6">
+        <span class="text-muted">Provider</span>
+      </div>
+      <div class="col-xs-6 text-right">
+        <span>{{ prettySysinfoProviderName(sysinfo.provider) }}</span>
+      </div>
+    </div>
+
+    <div class="row" ng-show="sysinfo.ip">
+      <div class="col-xs-6">
+        <span class="text-muted">IP Address</span>
+      </div>
+      <div class="col-xs-6 text-right">
+        <span>{{ sysinfo.ip }}</span>
+      </div>
+    </div>
+
+    <div class="row" ng-show="sysinfo.ifname">
+      <div class="col-xs-6">
+        <span class="text-muted">Network Interface Name</span>
+      </div>
+      <div class="col-xs-6 text-right">
+        <span>{{ sysinfo.ifname }}</span>
+      </div>
+    </div>
+
+    <br/>
+
     <div class="row">
       <div class="col-md-6 col-md-offset-6 text-right">
-        <button class="btn btn-outline btn-primary pull-right" ng-click="sysinfo.show()">Change Backend</button>
+        <button class="btn btn-outline btn-primary pull-right" ng-click="sysinfo.show()">Configure</button>
       </div>
     </div>
   </div>
diff --git a/src/views/network.js b/src/views/network.js
index 13c87eaff..a586ff8cb 100644
--- a/src/views/network.js
+++ b/src/views/network.js
@@ -10,17 +10,17 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
 
     // keep in sync with sysinfo.js
     $scope.sysinfoProvider = [
-        { name: 'Automatic (default)', value: 'generic' },
+        { name: 'Public IP', value: 'generic' },
         { name: 'Static IP Address', value: 'fixed' },
         { name: 'Network Interface', value: 'network-interface' }
     ];
 
     $scope.prettySysinfoProviderName = function (provider) {
         switch (provider) {
-            case 'generic': return 'Automatic';
-            case 'fixed': return 'Static IP Address';
-            case 'network-interface': return 'Network Interface';
-            default: return 'Unknown';
+        case 'generic': return 'Public IP';
+        case 'fixed': return 'Static IP Address';
+        case 'network-interface': return 'Network Interface';
+        default: return 'Unknown';
         }
     };
 
diff --git a/src/views/settings.html b/src/views/settings.html
index 7250386c5..a77e35a6f 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -209,7 +209,7 @@
     <div ng-show="!subscriptionBusy">
       <div class="row">
         <div class="col-xs-12">
-          A Cloudron account provides access to the Cloudron App Store. This ensures you are running the latest versions to keep your apps and server secure.
+          A Cloudron.io account provides access to the Cloudron App Store. This ensures you are running the latest versions to keep your apps and server secure.
         </div>
       </div>
       <br/>