diff --git a/Classes/Controller/AddressController.php b/Classes/Controller/AddressController.php
index 1979ab1..96f0d1c 100644
--- a/Classes/Controller/AddressController.php
+++ b/Classes/Controller/AddressController.php
@@ -397,7 +397,7 @@ public function approveAction($hash = NULL, $doApprove = false)
 
         $this->view->assign('hash', $hash);
 
-        if ($address && $doApprove) {
+        if ($address && $doApprove && $address->getHidden() === true) {
             $address->setHidden(false);
             $address->setModuleSysDmailHtml(true);
 
@@ -466,6 +466,8 @@ public function approveAction($hash = NULL, $doApprove = false)
 
             $persistenceManager = $this->objectManager->get(PersistenceManager::class);
             $persistenceManager->persistAll();
+            
+            $this->view->assign('gotApproved', true);
         }
 
         $this->view->assign('address', $address);
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index 4741ad4..ce51842 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -86,6 +86,9 @@ E-Mail: %3s</target>
 			<trans-unit id="form.approve.errortext" xml:space="preserve">
 				<target>Adresse konnte nicht in unserer Datenbank gefunden werden.</target>
 			</trans-unit>
+			<trans-unit id="form.approve.alreadyapproved" xml:space="preserve">
+				<target>Adresse wurde bereits bestätigt.</target>
+			</trans-unit>
 			<trans-unit id="form.approve.submitButton" xml:space="preserve">
 				<target>zustimmen</target>
 			</trans-unit>
diff --git a/Resources/Private/Templates/Address/Approve.html b/Resources/Private/Templates/Address/Approve.html
index 632a82f..562cedd 100644
--- a/Resources/Private/Templates/Address/Approve.html
+++ b/Resources/Private/Templates/Address/Approve.html
@@ -15,15 +15,22 @@
 
 <f:if condition="{address}">
 	<f:then>
-		<f:if condition="{doApprove}">
+		<f:if condition="{gotApproved}">
 			<f:then>
-				<p><f:translate key="form.approve.approvetext" htmlEscape="false" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
+				<f:if condition="{doApprove}">
+					<f:then>
+						<p><f:translate key="form.approve.approvetext" htmlEscape="false" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
+					</f:then>
+					<f:else>
+						<f:form action="approve" arguments="{hash: hash}">
+							<f:form.hidden name="doApprove" value="1" />
+							<f:form.submit value="{f:translate(key:'form.approve.submitButton')}" class="submit" />
+						</f:form>
+					</f:else>
+				</f:if>
 			</f:then>
 			<f:else>
-				<f:form action="approve" arguments="{hash: hash}">
-					<f:form.hidden name="doApprove" value="1" />
-					<f:form.submit value="{f:translate(key:'form.approve.submitButton')}" class="submit" />
-				</f:form>
+				<p><f:translate key="form.approve.alreadyapproved" /></p>
 			</f:else>
 		</f:if>
 	</f:then>
@@ -32,4 +39,4 @@
 	</f:else>
 </f:if>
 
-</f:section>
\ No newline at end of file
+</f:section>
diff --git a/composer.json b/composer.json
index 4b17ed7..6719b03 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,6 @@
         "friendsoftypo3/tt-address": ">=3.1.0 <3.2.99"
     },
     "replace": {
-        "registeraddress": "self.version",
         "typo3-ter/registeraddress": "self.version"
     },
     "autoload": {