diff --git a/frontend/app/users/edit-user.html b/frontend/app/users/edit-user.html
index 154b4b975..7f01b64c0 100644
--- a/frontend/app/users/edit-user.html
+++ b/frontend/app/users/edit-user.html
@@ -7,14 +7,13 @@ <h2>{{'ui.update.manage'|transl8}}</h2>
 
         <div class="col-md-6 col-md-offset-3 col-xs-12 well" ng-hide="success">
 
-            <form novalidate show-validation class="form-horizontal register-form"
-                  role="form" ng-keyup="dataChanged()">
+            <form novalidate show-validation class="form-horizontal register-form" role="form" ng-keyup="dataChanged()">
 
                 <div class="form-group">
                     <label class="col-sm-4 control-label">{{'ui_username'|transl8}}*</label>
                     <div class="col-sm-8">
                         <input required type="text" class="form-control" placeholder="{{'ui_username'|transl8}}"
-                               ng-model="user.username" readonly>
+                            ng-model="user.username" readonly>
                     </div>
                 </div>
 
@@ -22,11 +21,11 @@ <h2>{{'ui.update.manage'|transl8}}</h2>
                     <label class="col-sm-4 control-label">Name*</label>
                     <div class="col-sm-4">
                         <input required type="text" class="form-control" placeholder="{{'ui_first_name'|transl8}}"
-                               ng-model="user.firstname">
+                            ng-model="user.firstname">
                     </div>
                     <div class="col-sm-4">
                         <input required type="text" class="form-control" placeholder="{{'ui_surname'|transl8}}"
-                               ng-model="user.lastname">
+                            ng-model="user.lastname">
                     </div>
                 </div>
 
@@ -40,7 +39,7 @@ <h2>{{'ui.update.manage'|transl8}}</h2>
                 <div class="form-group">
                     <div class="col-sm-8 col-sm-offset-4">
                         <input required type="email" class="form-control" placeholder="{{'ui_repeat'|transl8}}"
-                               ng-model="user.emailValidation">
+                            ng-model="user.emailValidation">
                     </div>
                 </div>
 
@@ -51,286 +50,6 @@ <h2>{{'ui.update.manage'|transl8}}</h2>
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label class="col-sm-4 control-label">Homepage</label>
-                    <div class="col-sm-8">
-                        <input type="text" class="form-control" placeholder="Homepage" ng-model="user.homepage">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label class="col-sm-4 control-label">{{'ui_address'|transl8}}*</label>
-                    <div class="col-sm-3">
-                        <input required type="text" class="form-control" placeholder="{{'ui_zip'|transl8}}"
-                               ng-model="user.zip">
-                    </div>
-                    <div class="col-sm-5">
-                        <input required type="text" class="form-control" placeholder="{{'ui_place'|transl8}}"
-                               ng-model="user.place">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <div class="col-sm-8 col-sm-offset-4">
-                        <input required type="text" class="form-control" placeholder="{{'ui_street'|transl8}}"
-                               ng-model="user.street">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label class="col-sm-4 control-label">{{'ui_country'|transl8}}*</label>
-                    <div class="col-sm-8">
-                        <select required ng-model="user.country" class="form-control">
-                            <option value="">- {{'ui_please_select'|transl8}} -</option>
-                            <option value="AF">Afghanistan</option>
-                            <option value="EG">Ägypten</option>
-                            <option value="AL">Albanien</option>
-                            <option value="DZ">Algerien</option>
-                            <option value="AD">Andorra</option>
-                            <option value="AO">Angola</option>
-                            <option value="AI">Anguilla</option>
-                            <option value="AQ">Antarktis</option>
-                            <option value="AG">Antigua und Barbuda</option>
-                            <option value="GQ">Äquatorial Guinea</option>
-                            <option value="AR">Argentinien</option>
-                            <option value="AM">Armenien</option>
-                            <option value="AW">Aruba</option>
-                            <option value="AZ">Aserbaidschan</option>
-                            <option value="ET">Äthiopien</option>
-                            <option value="AU">Australien</option>
-                            <option value="BS">Bahamas</option>
-                            <option value="BH">Bahrain</option>
-                            <option value="BD">Bangladesh</option>
-                            <option value="BB">Barbados</option>
-                            <option value="BE">Belgien</option>
-                            <option value="BZ">Belize</option>
-                            <option value="BJ">Benin</option>
-                            <option value="BM">Bermudas</option>
-                            <option value="BT">Bhutan</option>
-                            <option value="MM">Birma</option>
-                            <option value="BO">Bolivien</option>
-                            <option value="BA">Bosnien-Herzegowina</option>
-                            <option value="BW">Botswana</option>
-                            <option value="BV">Bouvet Inseln</option>
-                            <option value="BR">Brasilien</option>
-                            <option value="IO">Britisch-Indischer Ozean</option>
-                            <option value="BN">Brunei</option>
-                            <option value="BG">Bulgarien</option>
-                            <option value="BF">Burkina Faso</option>
-                            <option value="BI">Burundi</option>
-                            <option value="CL">Chile</option>
-                            <option value="CN">China</option>
-                            <option value="CX">Christmas Island</option>
-                            <option value="CK">Cook Inseln</option>
-                            <option value="CR">Costa Rica</option>
-                            <option value="DK">Dänemark</option>
-                            <option value="DE">Deutschland</option>
-                            <option value="DJ">Djibuti</option>
-                            <option value="DM">Dominika</option>
-                            <option value="DO">Dominikanische Republik</option>
-                            <option value="EC">Ecuador</option>
-                            <option value="SV">El Salvador</option>
-                            <option value="CI">Elfenbeinküste</option>
-                            <option value="ER">Eritrea</option>
-                            <option value="EE">Estland</option>
-                            <option value="FK">Falkland Inseln</option>
-                            <option value="FO">Färöer Inseln</option>
-                            <option value="FJ">Fidschi</option>
-                            <option value="FI">Finnland</option>
-                            <option value="FR">Frankreich</option>
-                            <option value="GF">französisch Guyana</option>
-                            <option value="PF">Französisch Polynesien</option>
-                            <option value="TF">Französisches Süd-Territorium</option>
-                            <option value="GA">Gabun</option>
-                            <option value="GM">Gambia</option>
-                            <option value="GE">Georgien</option>
-                            <option value="GH">Ghana</option>
-                            <option value="GI">Gibraltar</option>
-                            <option value="GD">Grenada</option>
-                            <option value="GR">Griechenland</option>
-                            <option value="GL">Grönland</option>
-                            <option value="GB">Großbritannien</option>
-                            <option value="GP">Guadeloupe</option>
-                            <option value="GU">Guam</option>
-                            <option value="GT">Guatemala</option>
-                            <option value="GN">Guinea</option>
-                            <option value="GW">Guinea Bissau</option>
-                            <option value="GY">Guyana</option>
-                            <option value="HT">Haiti</option>
-                            <option value="HM">Heard und McDonald Islands</option>
-                            <option value="HN">Honduras</option>
-                            <option value="HK">Hong Kong</option>
-                            <option value="IN">Indien</option>
-                            <option value="ID">Indonesien</option>
-                            <option value="IQ">Irak</option>
-                            <option value="IR">Iran</option>
-                            <option value="IE">Irland</option>
-                            <option value="IS">Island</option>
-                            <option value="IL">Israel</option>
-                            <option value="IT">Italien</option>
-                            <option value="JM">Jamaika</option>
-                            <option value="JP">Japan</option>
-                            <option value="YE">Jemen</option>
-                            <option value="JO">Jordanien</option>
-                            <option value="YU">Jugoslawien</option>
-                            <option value="KY">Kaiman Inseln</option>
-                            <option value="KH">Kambodscha</option>
-                            <option value="CM">Kamerun</option>
-                            <option value="CA">Kanada</option>
-                            <option value="CV">Kap Verde</option>
-                            <option value="KZ">Kasachstan</option>
-                            <option value="KE">Kenia</option>
-                            <option value="KG">Kirgisistan</option>
-                            <option value="KI">Kiribati</option>
-                            <option value="CC">Kokosinseln</option>
-                            <option value="CO">Kolumbien</option>
-                            <option value="KM">Komoren</option>
-                            <option value="CG">Kongo</option>
-                            <option value="Demokratische Republik">Kongo</option>
-                            <option value="HR">Kroatien</option>
-                            <option value="CU">Kuba</option>
-                            <option value="KW">Kuwait</option>
-                            <option value="LA">Laos</option>
-                            <option value="LS">Lesotho</option>
-                            <option value="LV">Lettland</option>
-                            <option value="LB">Libanon</option>
-                            <option value="LR">Liberia</option>
-                            <option value="LY">Libyen</option>
-                            <option value="LI">Liechtenstein</option>
-                            <option value="LT">Litauen</option>
-                            <option value="LU">Luxemburg</option>
-                            <option value="MO">Macao</option>
-                            <option value="MG">Madagaskar</option>
-                            <option value="MW">Malawi</option>
-                            <option value="MY">Malaysia</option>
-                            <option value="MV">Malediven</option>
-                            <option value="ML">Mali</option>
-                            <option value="MT">Malta</option>
-                            <option value="MP">Marianen</option>
-                            <option value="MA">Marokko</option>
-                            <option value="MH">Marshall Inseln</option>
-                            <option value="MQ">Martinique</option>
-                            <option value="MR">Mauretanien</option>
-                            <option value="MU">Mauritius</option>
-                            <option value="YT">Mayotte</option>
-                            <option value="MK">Mazedonien</option>
-                            <option value="MX">Mexiko</option>
-                            <option value="FM">Mikronesien</option>
-                            <option value="MZ">Mocambique</option>
-                            <option value="MD">Moldavien</option>
-                            <option value="MC">Monaco</option>
-                            <option value="MN">Mongolei</option>
-                            <option value="MS">Montserrat</option>
-                            <option value="NA">Namibia</option>
-                            <option value="NR">Nauru</option>
-                            <option value="NP">Nepal</option>
-                            <option value="NC">Neukaledonien</option>
-                            <option value="NZ">Neuseeland</option>
-                            <option value="NI">Nicaragua</option>
-                            <option value="NL">Niederlande</option>
-                            <option value="AN">Niederländische Antillen</option>
-                            <option value="NE">Niger</option>
-                            <option value="NG">Nigeria</option>
-                            <option value="NU">Niue</option>
-                            <option value="KP">Nord Korea</option>
-                            <option value="NF">Norfolk Inseln</option>
-                            <option value="NO">Norwegen</option>
-                            <option value="OM">Oman</option>
-                            <option value="AT">Österreich</option>
-                            <option value="PK">Pakistan</option>
-                            <option value="PS">Palästina</option>
-                            <option value="PW">Palau</option>
-                            <option value="PA">Panama</option>
-                            <option value="PG">Papua Neuguinea</option>
-                            <option value="PY">Paraguay</option>
-                            <option value="PE">Peru</option>
-                            <option value="PH">Philippinen</option>
-                            <option value="PN">Pitcairn</option>
-                            <option value="PL">Polen</option>
-                            <option value="PT">Portugal</option>
-                            <option value="PR">Puerto Rico</option>
-                            <option value="QA">Qatar</option>
-                            <option value="RE">Reunion</option>
-                            <option value="RW">Ruanda</option>
-                            <option value="RO">Rumänien</option>
-                            <option value="RU">Rußland</option>
-                            <option value="LC">Saint Lucia</option>
-                            <option value="ZM">Sambia</option>
-                            <option value="AS">Samoa</option>
-                            <option value="WS">Samoa</option>
-                            <option value="SM">San Marino</option>
-                            <option value="ST">Sao Tome</option>
-                            <option value="SA">Saudi Arabien</option>
-                            <option value="SE">Schweden</option>
-                            <option value="CH">Schweiz</option>
-                            <option value="SN">Senegal</option>
-                            <option value="SC">Seychellen</option>
-                            <option value="SL">Sierra Leone</option>
-                            <option value="SG">Singapur</option>
-                            <option value="SK">Slowakei -slowakische Republik-</option>
-                            <option value="SI">Slowenien</option>
-                            <option value="SB">Solomon Inseln</option>
-                            <option value="SO">Somalia</option>
-                            <option value="South Sandwich Isl.">South Georgia</option>
-                            <option value="ES">Spanien</option>
-                            <option value="LK">Sri Lanka</option>
-                            <option value="SH">St. Helena</option>
-                            <option value="KN">St. Kitts Nevis Anguilla</option>
-                            <option value="PM">St. Pierre und Miquelon</option>
-                            <option value="VC">St. Vincent</option>
-                            <option value="KR">Süd Korea</option>
-                            <option value="ZA">Südafrika</option>
-                            <option value="SD">Sudan</option>
-                            <option value="SR">Surinam</option>
-                            <option value="SJ">Svalbard und Jan Mayen Islands</option>
-                            <option value="SZ">Swasiland</option>
-                            <option value="SY">Syrien</option>
-                            <option value="TJ">Tadschikistan</option>
-                            <option value="TW">Taiwan</option>
-                            <option value="TZ">Tansania</option>
-                            <option value="TH">Thailand</option>
-                            <option value="TP">Timor</option>
-                            <option value="TG">Togo</option>
-                            <option value="TK">Tokelau</option>
-                            <option value="TO">Tonga</option>
-                            <option value="TT">Trinidad Tobago</option>
-                            <option value="TD">Tschad</option>
-                            <option value="CZ">Tschechische Republik</option>
-                            <option value="TN">Tunesien</option>
-                            <option value="TR">Türkei</option>
-                            <option value="TM">Turkmenistan</option>
-                            <option value="TC">Turks und Kaikos Inseln</option>
-                            <option value="TV">Tuvalu</option>
-                            <option value="UG">Uganda</option>
-                            <option value="UA">Ukraine</option>
-                            <option value="HU">Ungarn</option>
-                            <option value="UY">Uruguay</option>
-                            <option value="UZ">Usbekistan</option>
-                            <option value="VU">Vanuatu</option>
-                            <option value="VA">Vatikan</option>
-                            <option value="VE">Venezuela</option>
-                            <option value="AE">Vereinigte Arabische Emirate</option>
-                            <option value="US">Vereinigte Staaten von Amerika</option>
-                            <option value="VN">Vietnam</option>
-                            <option value="VG">Virgin Island (Brit.)</option>
-                            <option value="VI">Virgin Island (USA)</option>
-                            <option value="WF">Wallis et Futuna</option>
-                            <option value="BY">Weißrußland</option>
-                            <option value="EH">Westsahara</option>
-                            <option value="CF">Zentralafrikanische Republik</option>
-                            <option value="ZW">Zimbabwe</option>
-                            <option value="CY">Zypern</option>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label class="col-sm-4 control-label">{{'ui_phone'|transl8}}</label>
-                    <div class="col-sm-8">
-                        <input type="text" class="form-control" placeholder="{{'ui_phone'|transl8}}" ng-model="user.phone">
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <div class="col-sm-offset-4 col-sm-8">
                         <div class="checkbox">
@@ -344,7 +63,8 @@ <h2>{{'ui.update.manage'|transl8}}</h2>
 
                 <div class="form-group">
                     <div class="col-sm-offset-4 col-sm-8">
-                        <button type="submit" ng-click="submit()" class="btn btn-primary">{{'ui.update.perform'|transl8}}
+                        <button type="submit" ng-click="submit()"
+                            class="btn btn-primary">{{'ui.update.perform'|transl8}}
                         </button>
                     </div>
                 </div>
diff --git a/frontend/app/users/register.html b/frontend/app/users/register.html
index 1ddc15e9d..6239a48f1 100644
--- a/frontend/app/users/register.html
+++ b/frontend/app/users/register.html
@@ -17,19 +17,19 @@ <h2>{{'register_register'|transl8}}</h2>
                 <label class="col-sm-4 control-label">{{'ui_username'|transl8}}*</label>
                 <div class="col-sm-8">
                     <input required type="text" class="form-control" placeholder="{{'ui_username'|transl8}}"
-                           ng-model="user.username">
+                        ng-model="user.username">
                 </div>
             </div>
 
             <div class="form-group">
                 <label for="inputPassword" class="col-sm-4 control-label">{{'ui_password'|transl8}}*</label>
                 <div class="col-sm-4">
-                    <input id="inputPassword" required type="password" class="form-control" placeholder="{{'ui_password'|transl8}}"
-                           ng-model="user.password">
+                    <input id="inputPassword" required type="password" class="form-control"
+                        placeholder="{{'ui_password'|transl8}}" ng-model="user.password">
                 </div>
                 <div class="col-sm-4">
                     <input required type="password" class="form-control" placeholder="{{'ui_repeat_password'|transl8}}"
-                           ng-model="user.passwordValidation">
+                        ng-model="user.passwordValidation">
                 </div>
             </div>
 
@@ -37,11 +37,11 @@ <h2>{{'register_register'|transl8}}</h2>
                 <label class="col-sm-4 control-label">Name*</label>
                 <div class="col-sm-4">
                     <input required type="text" class="form-control" placeholder="{{'ui_first_name'|transl8}}"
-                           ng-model="user.firstname">
+                        ng-model="user.firstname">
                 </div>
                 <div class="col-sm-4">
                     <input required type="text" class="form-control" placeholder="{{'ui_surname'|transl8}}"
-                           ng-model="user.lastname">
+                        ng-model="user.lastname">
                 </div>
             </div>
 
@@ -55,7 +55,7 @@ <h2>{{'register_register'|transl8}}</h2>
             <div class="form-group">
                 <div class="col-sm-8 col-sm-offset-4">
                     <input required type="email" class="form-control" placeholder="{{'ui_repeat'|transl8}}"
-                           ng-model="user.emailValidation">
+                        ng-model="user.emailValidation">
                 </div>
             </div>
 
@@ -66,46 +66,6 @@ <h2>{{'register_register'|transl8}}</h2>
                 </div>
             </div>
 
-            <div class="form-group">
-                <label class="col-sm-4 control-label">Homepage</label>
-                <div class="col-sm-8">
-                    <input type="text" class="form-control" placeholder="Homepage" ng-model="user.homepage">
-                </div>
-            </div>
-
-            <div class="form-group">
-                <label class="col-sm-4 control-label">{{'ui_address'|transl8}}*</label>
-                <div class="col-sm-3">
-                    <input required type="text" class="form-control" placeholder="{{'ui_zip'|transl8}}"
-                           ng-model="user.zip">
-                </div>
-                <div class="col-sm-5">
-                    <input required type="text" class="form-control" placeholder="{{'ui_place'|transl8}}"
-                           ng-model="user.place">
-                </div>
-            </div>
-
-            <div class="form-group">
-                <div class="col-sm-8 col-sm-offset-4">
-                    <input required type="text" class="form-control" placeholder="{{'ui_street'|transl8}}"
-                           ng-model="user.street">
-                </div>
-            </div>
-
-            <div class="form-group">
-                <label class="col-sm-4 control-label">{{'ui_country'|transl8}}*</label>
-                <div class="col-sm-8">
-                    <idai-country-picker model="user.country"></idai-country-picker>
-                </div>
-            </div>
-
-            <div class="form-group">
-                <label class="col-sm-4 control-label">{{'ui_phone'|transl8}}</label>
-                <div class="col-sm-8">
-                    <input type="text" class="form-control" placeholder="{{'ui_phone'|transl8}}" ng-model="user.phone">
-                </div>
-            </div>
-
             <div class="form-group">
                 <div class="col-sm-offset-4 col-sm-8">
                     <div class="checkbox">
@@ -141,4 +101,4 @@ <h2>{{'register_register'|transl8}}</h2>
 
     </div>
 
-</div>
+</div>
\ No newline at end of file