diff --git a/templates/form.php b/templates/form.php
index de89509..2f0b76f 100644
--- a/templates/form.php
+++ b/templates/form.php
@@ -1,6 +1,6 @@
 <?php
 \OCP\Util::addStyle('registration', 'style');
-?><form action="<?php print_unescaped(OC_Helper::linkToRoute('registration.register.createAccount', array('token'=>$_['token']))) ?>" method="post">
+?><form action="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('registration.register.createAccount', array('token'=>$_['token']))) ?>" method="post">
 	<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
 	<fieldset>
 		<?php if ( $_['errormsgs'] ) {?>
diff --git a/templates/register.php b/templates/register.php
index 1f97f1b..a07f60e 100644
--- a/templates/register.php
+++ b/templates/register.php
@@ -8,7 +8,7 @@ if ($_['entered']): ?>
 			</li>
 		</ul>
 	<?php else: ?>
-		<form action="<?php print_unescaped(OC_Helper::linkToRoute('registration.register.validateEmail')) ?>" method="post">
+		<form action="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('registration.register.validateEmail')) ?>" method="post">
 			<fieldset>
 				<ul class="error">
 					<li><?php print_unescaped($_['errormsg']); ?></li>
@@ -24,7 +24,7 @@ if ($_['entered']): ?>
 		</form>
 	<?php endif; ?>
 <?php else: ?>
-	<form action="<?php print_unescaped(OC_Helper::linkToRoute('registration.register.validateEmail')) ?>" method="post">
+	<form action="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('registration.register.validateEmail')) ?>" method="post">
 		<fieldset>
 			<?php if ($_['errormsg']): ?>
 				<ul class="error">