diff --git a/module/my/css/changepassword.css b/module/my/css/changepassword.css
index 994521df07..85d0a993c3 100644
--- a/module/my/css/changepassword.css
+++ b/module/my/css/changepassword.css
@@ -1 +1,2 @@
 #mainContent table > tbody > tr > td > div.text-danger.help-text {word-break: break-all;}
+[lang^=fr] #mainContent table > tbody > tr {white-space: nowrap;}
diff --git a/module/project/js/create.js b/module/project/js/create.js
index 8ef3cc4a52..9827c7423a 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -145,6 +145,17 @@ function setParentProgram(parentProgram)
         }
         budgetOverrunTips();
         outOfDateTip();
+        $('#budgetUnit').val(data.budgetUnit).trigger('chosen:updated');
+        if(typeof(data.availableBudget) == 'undefined')
+        {
+            $('#budget').removeAttr('placeholder').attr('disabled', true);
+            $('#future').prop('checked', true);
+        }
+        else
+        {
+            $('#budget').removeAttr('disabled')
+            $('#future').prop('checked', false);
+        }
     });
 
     $('#parent').attr('data-lastSelected', parentProgram);