diff --git a/Duplicati/Server/webroot/ngax/templates/about.html b/Duplicati/Server/webroot/ngax/templates/about.html
index 80335a459..13ffb7e93 100644
--- a/Duplicati/Server/webroot/ngax/templates/about.html
+++ b/Duplicati/Server/webroot/ngax/templates/about.html
@@ -28,11 +28,13 @@
 
         <div>&nbsp;</div>
 
-        <div class="prewrapped-text">{{Acknowledgements || Localization.localize('Loading ...')}}</div>
+        <div class="prewrapped-text" ng-show="Acknowledgements">{{Acknowledgements}}</div>
+        <div class="prewrapped-text" ng-hide="Acknowledgements" translate="">Loading ...</div>
     </div>
 
     <div ng-show="Page == 'changelog'">
-        <div class="prewrapped-text fixed-width-font">{{ChangeLog || Localization.localize('Loading ...')}}</div>
+        <div class="prewrapped-text fixed-width-font" ng-show="ChangeLog">{{ChangeLog}}</div>
+        <div class="prewrapped-text fixed-width-font" ng-hide="ChangeLog" translate="">Loading ...</div>
     </div>
 
     <div ng-show="Page == 'licenses'" class="licenses">
diff --git a/Duplicati/Server/webroot/ngax/templates/addoredit.html b/Duplicati/Server/webroot/ngax/templates/addoredit.html
index e5b85e217..5642bd2b2 100755
--- a/Duplicati/Server/webroot/ngax/templates/addoredit.html
+++ b/Duplicati/Server/webroot/ngax/templates/addoredit.html
@@ -67,7 +67,8 @@
                             <div class="tools">
                                 <ul>
                                     <li>
-                                        <a href ng-click="togglePassphraseVisibility()">{{ShowPassphrase ? 'Hide' : 'Show' | localize}}</a>
+                                        <a href ng-click="togglePassphraseVisibility()" ng-show="ShowPassphrase" translate>Hide</a>
+                                        <a href ng-click="togglePassphraseVisibility()" ng-hide="ShowPassphrase" translate>Show</a>
                                     </li>
                                     <li>|</li>
                                     <li>
@@ -105,7 +106,10 @@
                     </div>
                     <div class="input text overlayButton">
                         <input type="text" name="sourcePath" id="sourcePath" placeholder="Add a path directly" ng-model="manualSourcePath" ng-disabled="validatingSourcePath" />
-                        <a href id="sourceFolderPathAdd" class="button"  ng-disabled="validatingSourcePath || manualSourcePath == null || manualSourcePath == ''" ng-click="addManualSourcePath()">{{validatingSourcePath ? 'Validating ...' : 'Add path' | localize}}</a>
+                        <a href id="sourceFolderPathAdd" class="button"  ng-disabled="validatingSourcePath || manualSourcePath == null || manualSourcePath == ''" ng-click="addManualSourcePath()">
+                            <span ng-show="validatingSourcePath" translate>Validating ...</span>
+                            <span ng-hide="validatingSourcePath" translate>Add path</span>
+                        </a>
                     </div>
                 </div>
                 <div class="box filters">
diff --git a/Duplicati/Server/webroot/ngax/templates/backends/file.html b/Duplicati/Server/webroot/ngax/templates/backends/file.html
index 5f1d87f02..7c398ee9e 100644
--- a/Duplicati/Server/webroot/ngax/templates/backends/file.html
+++ b/Duplicati/Server/webroot/ngax/templates/backends/file.html
@@ -11,7 +11,10 @@
 <div class="input text" ng-hide="HideFolderBrowser">
 
     <div class="input" style="padding-bottom: 0px">
-        <a href ng-click="ShowHiddenFolders = !ShowHiddenFolders" style="float: right; margin-right: 10px;">{{ShowHiddenFolders ? 'Hide hidden folders' : 'Show hidden folders' | localize}}</a>
+        <a href ng-click="ShowHiddenFolders = !ShowHiddenFolders" style="float: right; margin-right: 10px;">
+            <span ng-show="ShowHiddenFolders" translate>Hide hidden folders</span>
+            <span ng-hide="ShowHiddenFolders" translate>Show hidden folders</span>
+        </a>
 
         <a href ng-click="HideFolderBrowser = true" style="float: right; margin-right: 10px;" translate>Manually type path</a>
     </div>
diff --git a/Duplicati/Server/webroot/ngax/templates/home.html b/Duplicati/Server/webroot/ngax/templates/home.html
index 138fcc6fd..f8ec73ae2 100644
--- a/Duplicati/Server/webroot/ngax/templates/home.html
+++ b/Duplicati/Server/webroot/ngax/templates/home.html
@@ -11,7 +11,8 @@
             <strong>{{'Running task:' | translate}} </strong>
             {{activeBackup.Backup.Name}}
 
-            <a class="button" ng-click="stopTask()">{{StopReqId == state.activeTask.Item1 ? 'Force stop' : 'Stop' | localize}}</a>
+            <a class="button" ng-click="stopTask()" ng-show="StopReqId == state.activeTask.Item1" translate>Force stop</a>
+            <a class="button" ng-click="stopTask()" ng-hide="StopReqId == state.activeTask.Item1" translate>Stop</a>
 
             <progress-bar ng-text="StateText" ng-progress="Progress"></progress-bar>
 
@@ -20,7 +21,8 @@
         <div ng-show="activeBackup == null &amp;&amp; state.activeTask != null">
             <strong translate>Running task</strong>
 
-            <a class="button" ng-click="stopTask()">{{StopReqId == state.activeTask.Item1 ? 'Force stop' : 'Stop' | localize}}</a>
+            <a class="button" ng-click="stopTask()" ng-show="StopReqId == state.activeTask.Item1" translate>Force stop</a>
+            <a class="button" ng-click="stopTask()" ng-hide="StopReqId == state.activeTask.Item1" translate>Stop</a>
         </div>
 
         <div ng-show="state.activeTask == null &amp;&amp; nextTask != null">
diff --git a/Duplicati/Server/webroot/ngax/templates/localdatabase.html b/Duplicati/Server/webroot/ngax/templates/localdatabase.html
index 386752351..9a5ce9a90 100644
--- a/Duplicati/Server/webroot/ngax/templates/localdatabase.html
+++ b/Duplicati/Server/webroot/ngax/templates/localdatabase.html
@@ -1,5 +1,8 @@
 <div ng-controller="LocalDatabaseController" class="localdb" >
-    <h1>{{'Local database for' | translate}} <b>{{Backup.Backup.Name || Localization.localize('...loading...')}}</b></h1>
+    <h1>{{'Local database for' | translate}} 
+        <b ng-show="Backup.Backup.Name">{{Backup.Backup.Name}}</b>
+        <b ng-hide="Backup.Backup.Name" translate>...loading...</b>
+    </h1>
 
     <div>
         {{'Each backup has a local database associated with it, which stores information about the remote backup on the local machine.\nThis makes it faster to perform many operations, and reduces the amount of data that needs to be downloaded for each operation.' | translate}}
diff --git a/Duplicati/Server/webroot/ngax/templates/log.html b/Duplicati/Server/webroot/ngax/templates/log.html
index a30b3a3da..a0e772c61 100644
--- a/Duplicati/Server/webroot/ngax/templates/log.html
+++ b/Duplicati/Server/webroot/ngax/templates/log.html
@@ -17,7 +17,10 @@
                 <div ng-show="expanded" class="prewrapped-text exceptiontext">{{item.Exception}}</div>
             </li>
         </ul>
-        <div ng-show="LogData != null &amp;&amp; !LogDataComplete" class="button" ng-click="LoadMoreStoredData()">{{LoadingData ? 'Loading ...' : 'Load older data' | localize}}}}</div>
+        <div ng-show="LogData != null &amp;&amp; !LogDataComplete" class="button" ng-click="LoadMoreStoredData()">
+            <span ng-show="LoadingData" translate>Loading ...</span>
+            <span ng-hide="LoadingData" translate>Load older data</span>
+        </div>
     </div>
 
     <div ng-show="Page=='live'">
@@ -45,7 +48,10 @@
                 <div ng-show="expanded" class="prewrapped-text exceptiontext">{{item.Exception}}</div>
             </li>
         </ul>
-        <div ng-show="GeneralData != null &amp;&amp; !GeneralDataComplete" class="button" ng-click="LoadMoreGeneralData()">{{LoadingData ? 'Loading ...' : 'Load older data' | localize}}}}</div>
+        <div ng-show="GeneralData != null &amp;&amp; !GeneralDataComplete" class="button" ng-click="LoadMoreGeneralData()">
+            <span ng-show="LoadingData" translate>Loading ...</span>
+            <span ng-hide="LoadingData" translate>Load older data</span>
+        </div>
     </div>
 
     <div ng-show="Page == 'remote'">
@@ -56,6 +62,9 @@
                 <div ng-show="expanded" class="prewrapped-text exceptiontext">{{item.Data}}</div>
             </li>
         </ul>
-        <div ng-show="RemoteData != null &amp;&amp; !RemoteDataComplete" class="button" ng-click="LoadMoreRemoteData()">{{LoadingData ? 'Loading ...' : 'Load older data' | localize}}}}</div>
+        <div ng-show="RemoteData != null &amp;&amp; !RemoteDataComplete" class="button" ng-click="LoadMoreRemoteData()">
+            <span ng-show="LoadingData" translate>Loading ...</span>
+            <span ng-hide="LoadingData" translate>Load older data</span>
+        </div>
     </div>
 </div>
diff --git a/Duplicati/Server/webroot/ngax/templates/restore.html b/Duplicati/Server/webroot/ngax/templates/restore.html
index b95895d35..6470f993f 100644
--- a/Duplicati/Server/webroot/ngax/templates/restore.html
+++ b/Duplicati/Server/webroot/ngax/templates/restore.html
@@ -16,7 +16,10 @@
             <div class="input text search overlayButton multiple" style="max-width: none">
                 <label for="searchfilter" translate>Search for files</label>
                 <input type="search" id="searchfilter" name="searchfilter" ng-model="SearchFilter" placeholder="{{'Type to highlight files' | translate}}" ng-on-enter-press="doSearch()" ng-on-escape-press="clearSearch()" />
-                <a href id="searchfiltersubmit" class="button" ng-click="doSearch()" ng-cancelsearch="clearSearch()" ng-enabled="!Searching">{{ Searching ? 'Busy...' : 'Search' | localize}}</a>
+                <a href id="searchfiltersubmit" class="button" ng-click="doSearch()" ng-cancelsearch="clearSearch()" ng-enabled="!Searching">
+                    <span ng-show="Searching" translate>Busy ...</span>
+                    <span ng-hide="Searching" translate>Search</span>
+                </a>
             </div>
 
             <div class="resizable filepicker">
@@ -52,7 +55,10 @@
             <div class="input text" ng-hide="HideFolderBrowser">
 
                 <div class="input" style="padding-bottom: 0px">
-                    <a href ng-click="ShowHiddenFolders = !ShowHiddenFolders" style="float: right; margin-right: 10px;">{{ShowHiddenFolders ? 'Hide hidden folders' : 'Show hidden folders' | localize}}</a>
+                    <a href ng-click="ShowHiddenFolders = !ShowHiddenFolders" style="float: right; margin-right: 10px;">
+                        <span ng-show="ShowHiddenFolders" translate>Hide hidden folders</span>
+                        <span ng-hide="ShowHiddenFolders" translate>Show hidden folders</span>
+                    </a>
 
                     <a href ng-click="HideFolderBrowser = true" style="float: right; margin-right: 10px;" translate>Manually type path</a>
                 </div>
diff --git a/Duplicati/Server/webroot/ngax/templates/updatechangelog.html b/Duplicati/Server/webroot/ngax/templates/updatechangelog.html
index df3186e06..1cb771033 100644
--- a/Duplicati/Server/webroot/ngax/templates/updatechangelog.html
+++ b/Duplicati/Server/webroot/ngax/templates/updatechangelog.html
@@ -5,7 +5,8 @@
         {{'Current version is {0} ({1})' | translate | args: systeminfo.ServerVersionName: systeminfo.ServerVersion}}
     </div>
 
-    <div class="prewrapped-text fixed-width-font">{{ChangeLog || Localization.localize('Loading ...')}}</div>
+    <div class="prewrapped-text fixed-width-font" ng-show="ChangeLog">{{ChangeLog}}</div>
+    <div class="prewrapped-text fixed-width-font" ng-hide="ChangeLog" translate>Loading ...</div>
 
     <div class="buttons">
         <a href class="button" ng-show="serverstate.UpdaterState == 'Waiting' &amp;&amp; serverstate.UpdatedVersion != null" ng-click="doInstall()" translate>Install</a>
diff --git a/Duplicati/Server/webroot/ngax/templates/waitarea.html b/Duplicati/Server/webroot/ngax/templates/waitarea.html
index 51106c28a..7001e753d 100644
--- a/Duplicati/Server/webroot/ngax/templates/waitarea.html
+++ b/Duplicati/Server/webroot/ngax/templates/waitarea.html
@@ -1,7 +1,8 @@
 <div class="waitarea">
     <div ng-show="serverstate.activeTask == null || serverstate.activeTask.Item1 != taskid" translate>Waiting for task to begin</div>
     <div ng-show="serverstate.activeTask != null &amp;&amp; serverstate.activeTask.Item1 == taskid">
-        <div>{{text || Localization.localize('Task is running')}}</div>
+        <div ng-show="text">{{text}}</div>
+        <div ng-hide="text" translate>Task is running</div>
         <div class="progress" style="border: 1px solid;">
             <span>{{ServerStatus.progress_state_text[serverstate.lastPgEvent.Phase] || serverstate.lastPgEvent.Phase}}</span>