diff --git a/AddCustomerNotes.php b/AddCustomerNotes.php
index a6f3bb89e..6addecc20 100644
--- a/AddCustomerNotes.php
+++ b/AddCustomerNotes.php
@@ -42,7 +42,7 @@
 	if (isset($Id) and $InputError !=1) {
 
 		$sql = "UPDATE custnotes SET note='" . $_POST['Note'] . "',
-									date='" . FormatDateForSQL($_POST['NoteDate']) . "',
+									date='" . $_POST['NoteDate'] . "',
 									href='" . $_POST['Href'] . "',
 									priority='" . $_POST['Priority'] . "'
 				WHERE debtorno ='".$DebtorNo."'
@@ -58,7 +58,7 @@
 				VALUES ('" . $DebtorNo. "',
 						'" . $_POST['Href'] . "',
 						'" . $_POST['Note'] . "',
-						'" . FormatDateForSQL($_POST['NoteDate']) . "',
+						'" . $_POST['NoteDate'] . "',
 						'" . $_POST['Priority'] . "')";
 		$msg = _('The contact notes record has been added');
 	}
@@ -211,12 +211,12 @@
 			</tr>';
 	}
 	echo '<tr>
-			<td>' . _('Date')  . '</td>';
+			<td>' . _('Date') . '</td>';
 	if (isset($_POST['NoteDate'])) {
-		echo '<td><input type="text" required name="NoteDate" class="date" value="'.ConvertSQLDate($_POST['NoteDate']).'" size="11" maxlength="10" /></td>
+		echo '<td><input type="date" required name="NoteDate"  value="' . $_POST['NoteDate'] . '" size="11" maxlength="10" /></td>
 			</tr>';
 	} else {
-		echo '<td><input type="text" required name="NoteDate" class="date" size="11" maxlength="10" /></td>
+		echo '<td><input type="date" required name="NoteDate" size="11" maxlength="10" /></td>
 			</tr>';
 	}
 	echo '<tr>
diff --git a/GLJournal.php b/GLJournal.php
index b638007f2..a7d4339cd 100644
--- a/GLJournal.php
+++ b/GLJournal.php
@@ -68,6 +68,7 @@
 		$_POST['CommitBatch'] = 'Do not do it the date is wrong';
 	}
 }
+
 if (isset($_POST['JournalType'])) {
 	$_SESSION['JournalDetail']->JournalType = $_POST['JournalType'];
 }
@@ -251,7 +252,7 @@
 	 A GL entry is created for each GL entry
 	*/
 
-	$PeriodNo = GetPeriod($_SESSION['JournalDetail']->JnlDate);
+	$PeriodNo = GetPeriod(ConvertSQLDate($_SESSION['JournalDetail']->JnlDate));
 
 	/*Start a transaction to do the whole lot inside */
 	$Result = DB_Txn_Begin();
@@ -442,7 +443,7 @@
         <td colspan="5"><table class="selection">
 						<tr>
 							<td>' . _('Date to Process Journal') . ':</td>
-							<td><input type="text" required="required" class="date" name="JournalProcessDate" maxlength="10" size="11" value="' . $_SESSION['JournalDetail']->JnlDate . '" /></td>
+							<td><input type="date" required="required" name="JournalProcessDate" maxlength="10" size="11" value="' . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . '" /></td>
 							<td>' . _('Type') . ':</td>
 							<td><select name="JournalType">';