diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index fe2dd714bd..c8ecb175ec 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -39,6 +39,9 @@
 			<!-- TMPL_IF NAME="ERROR_branch" -->
 				Branch : member should be of the same branch as you<br>
 			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_date" -->
+				Expiry date BEFORE enrollment date<br>
+			<!-- /TMPL_IF -->
 		</div>
 	<!-- /TMPL_IF -->
 	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 84274e82cb..08f40dd47a 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -117,6 +117,11 @@ if ($op eq 'add' or $op eq 'modify') {
 			}
 		}
 	}
+	warn "==> ".format_date_in_iso($data{'joining'})." > ".format_date_in_iso($data{'expiry'});
+	if ($data{'expiry'} && format_date_in_iso($data{'joining'}) > format_date_in_iso($data{'expiry'})) {
+		push @errors, "ERROR_date";
+		warn "ERROR DATE";
+	}
 	if ($nok) {
 		foreach my $error (@errors) {
 			$template->param( $error => 1);