diff --git a/src/com/savoirfairelinux/sflphone/client/CallElementList.java b/src/com/savoirfairelinux/sflphone/client/CallElementList.java
index 58c669d30772c1e85eabdffcf78e0f394f271b48..e36882b80cb0ce240cb34cac9cd9dba4f3b02a71 100644
--- a/src/com/savoirfairelinux/sflphone/client/CallElementList.java
+++ b/src/com/savoirfairelinux/sflphone/client/CallElementList.java
@@ -89,6 +89,10 @@ public class CallElementList extends ListFragment implements LoaderManager.Loade
     static final String[] CONTACTS_PHONES_PROJECTION = new String[] { Phone.NUMBER, Phone.TYPE };
     static final String[] CONTACTS_SIP_PROJECTION = new String[] { SipAddress.SIP_ADDRESS, SipAddress.TYPE };
 
+    public String getSelectedAccount() {
+        return mAccountSelectionButton.getText().toString();
+    }
+
     /**
      * Runnable that fill information in a contact card asynchroniously.
      */
diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
index d3bd1ae859179c1cb8e09e329592adb1cdd18d34..a3ead4b0af096a1f02e5c696031ff662b0d8d293 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
+++ b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
@@ -451,7 +451,8 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
     }
 
     public void processingNewCallAction() {
-        String accountID = mAccountList.currentAccountID;
+        // String accountID = mAccountList.currentAccountID;
+        String accountID = mCallElementList.getSelectedAccount();
         EditText editText = (EditText) findViewById(R.id.phoneNumberTextEntry);
         String to = editText.getText().toString();
 
diff --git a/src/com/savoirfairelinux/sflphone/utils/AccountDetailsHandler.java b/src/com/savoirfairelinux/sflphone/utils/AccountDetailsHandler.java
index 5fd0272d124bacd3db5bcf2f2c4eac1a3dc5a361..5496471d361c752779b06f74207ba4ec33b713e2 100644
--- a/src/com/savoirfairelinux/sflphone/utils/AccountDetailsHandler.java
+++ b/src/com/savoirfairelinux/sflphone/utils/AccountDetailsHandler.java
@@ -234,6 +234,7 @@ public class AccountDetailsHandler {
         nativemap.put(ServiceConstants.CONFIG_ACCOUNT_ALIAS, swigmap.get(ServiceConstants.CONFIG_ACCOUNT_ALIAS));
         nativemap.put(ServiceConstants.CONFIG_ACCOUNT_HOSTNAME, swigmap.get(ServiceConstants.CONFIG_ACCOUNT_HOSTNAME));
         nativemap.put(ServiceConstants.CONFIG_ACCOUNT_USERNAME, swigmap.get(ServiceConstants.CONFIG_ACCOUNT_USERNAME));
+        nativemap.put(ServiceConstants.CONFIG_ACCOUNT_PASSWORD, swigmap.get(ServiceConstants.CONFIG_ACCOUNT_USERNAME));
         nativemap.put(ServiceConstants.CONFIG_ACCOUNT_ROUTESET, swigmap.get(ServiceConstants.CONFIG_ACCOUNT_ROUTESET));
         nativemap.put(ServiceConstants.CONFIG_ACCOUNT_REGISTRATION_EXPIRE, swigmap.get(ServiceConstants.CONFIG_ACCOUNT_REGISTRATION_EXPIRE));