diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 5aa5253..a63f048 100755
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -273,14 +273,12 @@ class UserController extends Controller
                         'title' => $sanitizedText,
                     ]);
                 }elseif($linkType->typename == "email"){
-                    $LinkURL = "mailto:".$LinkURL;
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'button_id' => $button?->id,
                         'title' => $LinkTitle,
                     ]);
                 }elseif($linkType->typename == "telephone"){
-                    $LinkURL = "tel:".$LinkURL;
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'button_id' => $button?->id,
@@ -398,10 +396,8 @@ class UserController extends Controller
                 $links->button_id = "93";
                 $links->title = $sanitizedText;
             }elseif($linkType->typename == "email"){
-                $links->link = "mailto:".$links->link;
                 $links->button_id = $button?->id;
             }elseif($linkType->typename == "telephone"){
-                $links->link = "tel:".$links->link;
                 $links->button_id = $button?->id;
             }elseif($linkType->typename == "vcard"){
 
diff --git a/resources/views/components/pageitems/email-form.blade.php b/resources/views/components/pageitems/email-form.blade.php
index 06a1668..6a5c8ba 100644
--- a/resources/views/components/pageitems/email-form.blade.php
+++ b/resources/views/components/pageitems/email-form.blade.php
@@ -10,3 +10,14 @@
 <input type='email' name='link' value='{{str_replace("mailto:", "", $link_url)}}' class='form-control' required />
 <span class='small text-muted'>{{__('messages.Enter your E-Mail')}}</span>
 
+<script>
+$(document).ready(function() {
+    $('form').on('submit', function(e) {
+        var linkInput = $(this).find('input[name="link"]');
+        var linkValue = linkInput.val();
+        if (!linkValue.toLowerCase().startsWith('mailto:')) {
+            linkInput.val('mailto:' + linkValue);
+        }
+    });
+});
+</script>
\ No newline at end of file
diff --git a/resources/views/components/pageitems/telephone-form.blade.php b/resources/views/components/pageitems/telephone-form.blade.php
index 3b0203c..ede9d25 100644
--- a/resources/views/components/pageitems/telephone-form.blade.php
+++ b/resources/views/components/pageitems/telephone-form.blade.php
@@ -10,3 +10,14 @@
 <input type='tel' name='link' value='{{str_replace("tel:", "", $link_url)}}' class='form-control' required />
 <span class='small text-muted'>{{__('messages.Enter your telephone number')}}</span>
 
+<script>
+$(document).ready(function() {
+    $('form').on('submit', function(e) {
+        var linkInput = $(this).find('input[name="link"]');
+        var linkValue = linkInput.val();
+        if (!linkValue.toLowerCase().startsWith('tel:')) {
+            linkInput.val('tel:' + linkValue);
+        }
+    });
+});
+</script>
\ No newline at end of file