diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js
index 6d4ccb7e3..a0891573b 100644
--- a/admin/javascript/LeftAndMain.js
+++ b/admin/javascript/LeftAndMain.js
@@ -428,6 +428,23 @@ jQuery.noConflict();
 		}
 
 	});
+
+	/**
+	 * Simple toggle link, which points to a DOm element by its ID selector
+	 * in the href attribute (which doubles as an anchor link to that element).
+	 */
+	$('.cms .cms-help-toggle').entwine({
+		onmatch: function() {
+			this._super();
+
+			$(this.attr('href')).hide();
+		},
+		onclick: function(e) {
+			$(this.attr('href')).toggle();
+			e.preventDefault();
+		}
+	});
+	
 }(jQuery));
 
 var statusMessage = function(text, type) {
diff --git a/forms/MemberDatetimeOptionsetField.php b/forms/MemberDatetimeOptionsetField.php
index 158a5da0b..c8bf8031b 100644
--- a/forms/MemberDatetimeOptionsetField.php
+++ b/forms/MemberDatetimeOptionsetField.php
@@ -6,9 +6,6 @@
 class MemberDatetimeOptionsetField extends OptionsetField {
 
 	function Field() {
-		Requirements::javascript(THIRDPARTY_DIR . '/thirdparty/jquery/jquery.js');
-		Requirements::javascript(SAPPHIRE_DIR . '/javascript/MemberDatetimeOptionsetField.js');
-
 		$options = '';
 		$odd = 0;
 		$source = $this->getSource();
@@ -45,8 +42,12 @@ class MemberDatetimeOptionsetField extends OptionsetField {
 			_t('MemberDatetimeOptionsetField.Preview', 'Preview'),
 			Zend_Date::now()->toString($value)
 		) : '';
-		$options .= "<a class=\"formattingHelpToggle\" href=\"#\">" . _t('MemberDatetimeOptionsetField.TOGGLEHELP', 'Toggle formatting help') . "</a>";
-		$options .= "<div class=\"formattingHelpText\">";
+		$options .= sprintf(
+			'<a class="cms-help-toggle" href="#%s">%s</a>',
+			$this->id() . '_Help',
+			_t('MemberDatetimeOptionsetField.TOGGLEHELP', 'Toggle formatting help')
+		);
+		$options .= "<div id=\"" . $this->id() . "_Help\">";
 		$options .= $this->getFormattingHelpText();
 		$options .= "</div>";
 		$options .= "</li>\n";
diff --git a/javascript/MemberDatetimeOptionsetField.js b/javascript/MemberDatetimeOptionsetField.js
deleted file mode 100644
index a88feae02..000000000
--- a/javascript/MemberDatetimeOptionsetField.js
+++ /dev/null
@@ -1,7 +0,0 @@
-(function($) {
-	$('.formattingHelpText').hide();
-	$('.formattingHelpToggle').click(function() {
-		$(this).parent().find('.formattingHelpText').toggle();
-		return false;
-	})
-})(jQuery);
\ No newline at end of file