diff --git a/src/cube/MainMenuController.cpp b/src/cube/MainMenuController.cpp
index 43ef8c97e..a4488b3ca 100644
--- a/src/cube/MainMenuController.cpp
+++ b/src/cube/MainMenuController.cpp
@@ -91,7 +91,7 @@ void        MainMenuController::OnAddLibraryLocal(MenuItemRef menuItem)
 void        MainMenuController::OnAddLibraryRemote(MenuItemRef menuItem)
 {
     win32cpp::TopLevelWindow popupDialog(_T("Add remote library"));
-    popupDialog.SetMinimumSize(Size(300, 150));
+    popupDialog.SetMinimumSize(Size(300, 220));
 
     dialog::AddLibraryController addLibrary(popupDialog,musik::core::LibraryFactory::Remote);
 
diff --git a/src/cube/dialog/AddLibraryController.cpp b/src/cube/dialog/AddLibraryController.cpp
index ae7264bfd..d42bf05c3 100644
--- a/src/cube/dialog/AddLibraryController.cpp
+++ b/src/cube/dialog/AddLibraryController.cpp
@@ -89,7 +89,13 @@ void AddLibraryController::OnOK(win32cpp::Button* button){
             prefs.SetString("address",this->view->remoteHost->Caption().c_str());
             prefs.SetString("port",this->view->remotePort->Caption().c_str());
             prefs.SetString("username",this->view->username->Caption().c_str());
-            prefs.SetString("password",UTF8_TO_UTF(musik::core::Crypt::Encrypt(UTF_TO_UTF8(this->view->remotePort->Caption().c_str()),musik::core::Crypt::StaticSalt())).c_str());
+
+            utfstring password( 
+                UTF8_TO_UTF( 
+                musik::core::Crypt::Encrypt(
+                UTF_TO_UTF8(this->view->password->Caption()),musik::core::Crypt::StaticSalt())));
+
+            prefs.SetString("password",password.c_str());
         }
 
         library->Startup();
diff --git a/src/server/users/EditUserController.cpp b/src/server/users/EditUserController.cpp
index af2efa3c1..41993f1d2 100644
--- a/src/server/users/EditUserController.cpp
+++ b/src/server/users/EditUserController.cpp
@@ -85,7 +85,7 @@ void EditUserController::OnOK(win32cpp::Button* button){
     // TODO: Save user
     this->server->CreateUser( 
             this->view->username->Caption(),
-            UTF8_TO_UTF(musik::core::Crypt::Encrypt( musik::core::ConvertUTF8(this->view->password->Caption()),musik::core::Crypt::StaticSalt())),
+            this->view->password->Caption(),
             this->view->nickname->Caption()
             );