diff --git a/components/membershiprenew.php b/components/membershiprenew.php
index 87d90f529a024d13a86b599c0bcd40101abab4b6..fd559a0b2deb7ffc1c9618f0469b23c05bc0e122 100644
--- a/components/membershiprenew.php
+++ b/components/membershiprenew.php
@@ -7,8 +7,7 @@ $permission="staff";
 $enable=TRUE;
 
 // Set next payment date
-$nextyear = academicYear(time())+1;
-$paydate="Sept. ".$nextyear;
+$paydate = paidUntil(time());
 
 // Only staff can use this page
 if (isset($session->groups[$permission])) {
diff --git a/lib/date.php b/lib/date.php
index 2b45e9985acf1fce0ec6f8f306797a73f9c4298b..2f584fb484be793684010daa76c859943d8c114c 100644
--- a/lib/date.php
+++ b/lib/date.php
@@ -15,10 +15,10 @@ function academicYear($timestamp) {
 	}
 }
 
-
-
-
-
-
+function paidUntil($timestamp) {
+	$nextyear = academicYear($timestamp)+1;
+	$paydate = "Sept. ".$nextyear;
+	return $paydate;
+}
 
 ?>