diff --git a/includes/ScaldAtom.inc b/includes/ScaldAtom.inc
index d1a5737..86f98a8 100644
--- a/includes/ScaldAtom.inc
+++ b/includes/ScaldAtom.inc
@@ -20,6 +20,13 @@ class ScaldAtom {
       'data' => array(),
     );
 
+    if (module_exists('entity_translation')) {
+      unset($values['language']);
+      $handler = entity_translation_get_handler('scald_atom',(object) $values);
+      $langcode = $handler->getLanguage();
+      $values['language'] = $langcode;
+    }
+
     foreach ($values as $key => $value) {
       $this->$key = $value;
     }
diff --git a/includes/scald.translation_handler.inc b/includes/scald.translation_handler.inc
index eb21625..b2e4c9e 100644
--- a/includes/scald.translation_handler.inc
+++ b/includes/scald.translation_handler.inc
@@ -31,7 +31,7 @@ class EntityTranslationScaldHandler extends EntityTranslationDefaultHandler {
    */
   public function getEditPath($langcode = NULL) {
     $edit_path = parent::getEditPath($langcode);
-    return str_replace('/%ctools_js', '', $edit_path);
+    return str_replace('/%ctools_js', '/nojs', $edit_path);
   }
 
   /**
diff --git a/scald.module b/scald.module
index b77b518..e2c0b0c 100644
--- a/scald.module
+++ b/scald.module
@@ -2567,6 +2567,28 @@ function scald_form_user_admin_permissions_alter(&$form, &$form_state, $form_id)
   $form['#submit'][] = 'scald_permissions_submit';
 }
 
+/*
+ * Implements hook_form_FORM_ID_alter().
+ * In case the title module is used the title field has to be populated from the title
+ * attribute when the user comes from the add step.
+ */
+function scald_form_scald_atom_add_form_options_alter(&$form, &$form_state, $form_id) {
+  if (module_exists('title') && module_exists('entity_translation')) {
+    $scald = $form_state['scald'];
+    if (isset($scald['type'])) {
+      // Setting default values for each created atom
+      foreach($form as $key => $data) {
+        if (strpos($key, 'atom') === 0) {
+          if (!empty($form[$key]['title']['#default_value'])) {
+            $langcode = $form['language']['#value'];
+            $form[$key]['title_field'][$langcode][0]['value']['#default_value'] = $form[$key]['title']['#default_value'];
+          }
+        }
+      }
+    }
+  }
+}
+
 /**
  * Handles the permissions form submission.
  */