diff --git a/platform/debian/Release b/platform/debian/Release
index 5020eaf688e37bfb04013e7c8fbbe126a9ce2f27..116d3eaeafdb43becbc2bcc223fab5e2184575c1 100644
--- a/platform/debian/Release
+++ b/platform/debian/Release
@@ -1,7 +1,7 @@
 Archive : unstable
-Version: 0.8.2-3
-Component : main
+Version: 0.8.5
+Component : universe
 Origin : SFLphone
 Label : sflphone
-Architecture : i386
+Architecture : all
 
diff --git a/platform/debian/autopackage.sh b/platform/debian/autopackage.sh
index 6fedd7edb24b9b18e0641d5b354c0f5163174c4c..923f4ee24c36308abf8628b51c6f498e05ca19f1 100755
--- a/platform/debian/autopackage.sh
+++ b/platform/debian/autopackage.sh
@@ -6,13 +6,13 @@
 
 if [ $1 = "-h" ]
 then
-  echo "Usage: ./sfl_debian.sh version arch"
-  echo "For instance: ./sfl_debian.sh 0.8.2 i386"
+  echo "Usage: ./autopackage.sh version arch"
+  echo "For instance: ./autopackage.sh 0.8.2 all"
   exit 0
 fi
 
 # Libraries dependencies
-dependencies="libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , gnome-common , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libosip2-3, libexosip2-5, libcommoncpp2-1.5.3-0 , libccrtp1-1.5-1 , libiax0 , libgtkglext1"
+dependencies="libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , gnome-common , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libosip2-2, libexosip2-4, libcommoncpp2-1.6-0 , libccrtp1-1.6-0  , libiax0 , libgtkglext1"
 
 # Package Infos
 package="sflphone"
@@ -40,6 +40,7 @@ debdir="$sfldir/DEBIAN"
 mkdir -p $sfldir$bindir
 cp $bindir/sflphoned $sfldir$bindir
 cp $bindir/sflphone-gtk $sfldir$bindir
+ln -sf $bindir/sflphone-gtk $sfldir$bindir/sflphone
 
 #/usr/lib
 mkdir -p $sfldir/usr/lib/sflphone/codecs
@@ -89,3 +90,6 @@ echo "Description: $desc" >> $control
 echo "Build the debian package ... "
 dpkg --build $sfldir ${sfldir}_$2.deb
 
+# Clean up the generated stuff
+echo "Clean up ... "
+rm -rf $sfldir 
diff --git a/platform/debian/package b/platform/debian/package
index a36f1b17b4cfd6ed527fe618447af18c10ec12dd..48d8c4b9640c146ed1adcef04ccbd57b31d31551 100644
--- a/platform/debian/package
+++ b/platform/debian/package
@@ -1 +1 @@
-sflphone_0.8.2-3
+sflphone_0.8.5
diff --git a/platform/debian/upload.sh b/platform/debian/upload.sh
index d71df16f30a965065d9de237f743876d3388d715..197740fe8e4d73863b6215c1cfac9053b3e3f63d 100755
--- a/platform/debian/upload.sh
+++ b/platform/debian/upload.sh
@@ -1,3 +1,3 @@
 !#/bin/sh
 
-scp $1 sflphone_org@gpl.savoirfairelinux.net:/var/www/vhosts/sflphone.org/htdocs/debian/dists/unstable/main/binary-i386
+scp $1 root@gpl.savoirfairelinux.net:/var/www/vhosts/sflphone.org/htdocs/debian/dists/unstable/universe/binary-i386
diff --git a/sflphone-gtk/src/accountwindow.c b/sflphone-gtk/src/accountwindow.c
index 32160fa8369231f011ea1c5965a6d458b887e7c8..0e110fd2b27b509a6cb339b45d431445416aee69 100644
--- a/sflphone-gtk/src/accountwindow.c
+++ b/sflphone-gtk/src/accountwindow.c
@@ -353,7 +353,7 @@ show_account_window (account_t * a)
     /** @todo Verify if it's the best condition to check */
     if (currentAccount->accountID == NULL) {
       dbus_add_account(currentAccount);
-      account_list_set_current_id( currentAccount->accountID);
+      account_list_set_current_id( currentAccount->accountID );
     }
     else {
       dbus_set_account_details(currentAccount);
diff --git a/sflphone-gtk/src/assistant.c b/sflphone-gtk/src/assistant.c
index a318f0d1adbd3e8c3efc8fbe4da2e76d7778636c..33f8caadc0cd9f2af2530e799d987ef533bee8dd 100644
--- a/sflphone-gtk/src/assistant.c
+++ b/sflphone-gtk/src/assistant.c
@@ -71,6 +71,8 @@ apply_callback( void )
   }
 
   dbus_add_account( current );
+  account_list_set_current_id( current->accountID );
+
 }
 
   void
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index f26e54f7bcbc5aa8ace6853796a4a9e72c3d7203..0f0bf39e1eac8184d76964b6f68fae056a303137 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -607,7 +607,7 @@ ManagerImpl::peerHungupCall(const CallID& id)
   if (accountid == AccountNULL) {
     _debug("peerHungupCall: Call doesn't exists\n");
     return;
-  }
+  
   if (_dbus) _dbus->getCallManager()->callStateChanged(id, "HUNGUP");
   if (isCurrentCall(id)) {
     stopTone(true);
@@ -1883,7 +1883,7 @@ ManagerImpl::sendRegister( const ::DBus::String& accountID , bool expire )
  
   Account* acc = getAccount(accountID);
   acc->loadConfig();
-  // Test on the value freshly updated
+  // Test on the freshly updated value
   if ( acc->isEnabled() ) {
     // Verify we aren't already registered, then register
       _debug("Send register for account %s\n" , accountID.c_str());