diff --git a/web/app/integration/integration.component.html b/web/app/integration/integration.component.html
index 0c6cbb2..3f9d756 100644
--- a/web/app/integration/integration.component.html
+++ b/web/app/integration/integration.component.html
@@ -6,11 +6,8 @@
             <div class="switch" *ngIf="integration.type !== 'bridge'">
                 <ui-switch [checked]="integration.isEnabled" size="small" [disabled]="integration.isBroken" (change)="update()"></ui-switch>
             </div>
-            <div class="switch" *ngIf="integration.type == 'bridge' && integration.isEnabled">
-                <ui-switch [checked]="true" size="small" [disabled]="true" ngbTooltip="This integration is always enabled. Click the cog to configure it."></ui-switch>
-            </div>
             <div class="switch" *ngIf="integration.type == 'bridge' && !integration.isEnabled">
-                <ui-switch [checked]="false" size="small" [disabled]="true" ngbTooltip="{{ integration.bridgeError }}"></ui-switch>
+                <i class="fa fa-warning text-warning" ngbTooltip="{{ integration.bridgeError }}"></i>
             </div>
             <div class="toolbar">
                 <i class="fa fa-question-circle text-info" ngbTooltip="{{integration.about}}" *ngIf="integration.about"></i>
diff --git a/web/app/riot/riot.component.ts b/web/app/riot/riot.component.ts
index da44e67..06b68a8 100644
--- a/web/app/riot/riot.component.ts
+++ b/web/app/riot/riot.component.ts
@@ -68,7 +68,7 @@ export class RiotComponent {
                 integration.isBroken = false;
             }, error => {
                 console.error(error);
-                integration.bridgeError = error.message;
+                integration.bridgeError = error.message || error;
                 integration.isEnabled = false;
                 integration.isBroken = false;
             });