diff --git a/studentview/assets/js/config.js b/studentview/assets/js/config.js
index b0beccebcfd4cae10669e08f28db5d8d2f097b37..af79dfc9d5b448c751e0f1bf6ef47fc2b0e569b8 100644
--- a/studentview/assets/js/config.js
+++ b/studentview/assets/js/config.js
@@ -1,2 +1,3 @@
 //var compbaseUrl = "https://esb.uni-potsdam.de:8243/services/competenceBase";
-var compbaseUrl = "http://fleckenroller.cs.uni-potsdam.de/app/competence-database-prod";
\ No newline at end of file
+//var compbaseUrl = "http://fleckenroller.cs.uni-potsdam.de/app/competence-database-prod";
+var compbaseUrl = "https://apiup.uni-potsdam.de/endpoints/competenceAPI";
diff --git a/studentview/database/config.php b/studentview/database/config.php
index f5ed444e9e87fe52c7892ae791f76fe2e2b2695b..b350864e60320db20c45ac6a4dd024eaf2edec3d 100644
--- a/studentview/database/config.php
+++ b/studentview/database/config.php
@@ -6,5 +6,5 @@
  * Time: 12:38
  */
 
-$db = mysqli_connect("localhost", "root2", "voyager2", "fltrail");
-//$db = mysqli_connect("localhost", "root", "voyager", "fltrail");
+//$db = mysqli_connect("localhost", "root2", "voyager2", "fltrail");
+$db = mysqli_connect("localhost", "root", "voyager", "fltrail");
diff --git a/studentview/pages/preferences.php b/studentview/pages/preferences.php
index 9ddf8defe4b3d2d1f14e9c514b9f9b09ddbbca2e..30dd2ca3717670eb88daf84c1201f0a554b0e073 100644
--- a/studentview/pages/preferences.php
+++ b/studentview/pages/preferences.php
@@ -103,8 +103,11 @@ $projectName = $resultObj->id;
         </div>
     </fieldset>
     <button class="btn btn-primary" id="studentFormSubmit" style="width:90px;margin-left:169px;margin-top:13px;">
-        Eintragen
+        eintragen
     </button>
+    <div class="alert alert-warning" role="alert">
+        Das Verarbeiten der Lernziele und das Gruppenmatching kann einen Moment dauern!
+    </div>
 </div>
 
 </body>
diff --git a/studentview/register.php b/studentview/register.php
index f9383b1410befee32042af65e9e0a8076eb42761..9a7db9eb909974fb73fbcc7c3427869e58151d03 100644
--- a/studentview/register.php
+++ b/studentview/register.php
@@ -22,6 +22,7 @@
             <div class="form-group"><input class="form-control" name="name" placeholder="Name"></div>
             <div class="form-group"><input class="form-control" type="email" name="email" placeholder="Email"></div>
             <div class="form-group"><input class="form-control" type="password" name="password" placeholder="Password"></div>
+            <div class="form-group"><label>Bitte kein sensibeles Passwort verwenden!</label></div>
             <!--<div class="form-group"><input class="form-control" type="password" name="password"
                                            placeholder="Password wiederholen"></div>-->
             <div class="form-group"><button class="btn btn-primary btn-block" type="submit">registrieren</button></div>