diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 7ce47b9cd7..020e3906a0 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -374,7 +374,7 @@ class Contact extends BaseModule
 
 			if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
 				self::updateContactFromProbe($contact_id);
-				DI::baseUrl()->redirect('crepair/' . $contact_id);
+				DI::baseUrl()->redirect('contact/' . $contact_id . '/advanced/');
 				// NOTREACHED
 			}
 
@@ -910,7 +910,7 @@ class Contact extends BaseModule
 
 		if (!empty($contact['uid'])) {
 			$tabs[] = ['label' => DI::l10n()->t('Advanced'),
-				'url'   => 'crepair/' . $contact['id'],
+				'url'   => 'contact/' . $contact['id'] . '/advanced/',
 				'sel'   => (($active_tab == 6) ? 'active' : ''),
 				'title' => DI::l10n()->t('Advanced Contact Settings'),
 				'id'    => 'advanced-tab',
diff --git a/view/theme/frio/templates/crepair.tpl b/view/theme/frio/templates/contact/advanced.tpl
similarity index 94%
rename from view/theme/frio/templates/crepair.tpl
rename to view/theme/frio/templates/contact/advanced.tpl
index df49762001..5c814e51ea 100644
--- a/view/theme/frio/templates/crepair.tpl
+++ b/view/theme/frio/templates/contact/advanced.tpl
@@ -11,7 +11,7 @@
 	</div>
 	<br />
 
-	<form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
+	<form id="crepair-form" action="contact/{{$contact_id}}/advanced" method="post" >
 
 		<!-- <h4>{{$contact_name}}</h4> -->