diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html
index 819ced834..e1260c123 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/users/user-edit/user-edit.component.html
@@ -122,9 +122,11 @@
             </ng-container>
           </ng-template>
         </my-help>
-        <my-input-toggle-hidden formControlName="password" id="password"
-                          [ngClass]="{ 'input-error': formErrors['password'] }"
-                          autocomplete="new-password"></my-input-toggle-hidden>
+
+        <my-input-toggle-hidden
+          formControlName="password" id="password" [ngClass]="{ 'input-error': formErrors['password'] }" autocomplete="new-password"
+        ></my-input-toggle-hidden>
+
         <div *ngIf="formErrors.password" class="form-error">
           {{ formErrors.password }}
         </div>
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.scss b/client/src/app/+admin/users/user-edit/user-edit.component.scss
index 30c37f148..3b7715062 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.component.scss
+++ b/client/src/app/+admin/users/user-edit/user-edit.component.scss
@@ -19,6 +19,12 @@ input:not([type=submit]) {
   display: block;
 }
 
+my-input-toggle-hidden {
+  @include responsive-width(340px);
+
+  display: block;
+}
+
 .peertube-select-container {
   @include peertube-select-container(340px);
 }
diff --git a/client/src/app/shared/shared-instance/instance-follow.service.ts b/client/src/app/shared/shared-instance/instance-follow.service.ts
index f99dced21..229b58213 100644
--- a/client/src/app/shared/shared-instance/instance-follow.service.ts
+++ b/client/src/app/shared/shared-instance/instance-follow.service.ts
@@ -9,7 +9,7 @@ import { environment } from '../../../environments/environment'
 
 @Injectable()
 export class InstanceFollowService {
-  private static BASE_APPLICATION_URL = 'https://peertube2.cpy.re' + '/api/v1/server'
+  private static BASE_APPLICATION_URL = environment.production + '/api/v1/server'
 
   constructor (
     private authHttp: HttpClient,
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 19b4e204f..1231d2c44 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -305,6 +305,13 @@
   z-index: 100;
 }
 
+@mixin responsive-width ($width) {
+  width: $width;
+
+  @media screen and (max-width: $width) {
+    width: 100%;
+  }
+}
 
 @mixin ng-select ($width) {
   ::ng-deep &.ng-select,