diff --git a/internal/services/email_service.go b/internal/services/email_service.go
index 61c8800..482dfcb 100644
--- a/internal/services/email_service.go
+++ b/internal/services/email_service.go
@@ -79,12 +79,14 @@ func (s *EmailService) SendVerificationEmail(user *models.User, token *string) e
 func (s *EmailService) SendWelcomeEmail(user *models.User) error {
 	// Prepare data to be injected into the template
 	data := struct {
+		Company         string
 		FirstName       string
 		MembershipModel string
 		MembershipID    int64
 		MembershipFee   float32
 		RentalFee       float32
 	}{
+		Company:         *user.Company,
 		FirstName:       user.FirstName,
 		MembershipModel: user.Membership.SubscriptionModel.Name,
 		MembershipID:    user.Membership.ID,
@@ -104,6 +106,7 @@ func (s *EmailService) SendWelcomeEmail(user *models.User) error {
 func (s *EmailService) NotifyAdminOfNewUser(user *models.User) error {
 	// Prepare data to be injected into the template
 	data := struct {
+		Company         string
 		FirstName       string
 		LastName        string
 		MembershipModel string
@@ -118,6 +121,7 @@ func (s *EmailService) NotifyAdminOfNewUser(user *models.User) error {
 		Phone           string
 		IBAN            string
 	}{
+		Company:         *user.Company,
 		FirstName:       user.FirstName,
 		LastName:        user.LastName,
 		MembershipModel: user.Membership.SubscriptionModel.Name,
diff --git a/templates/email/mail_registration.html b/templates/email/mail_registration.html
index cfcaa49..179b12d 100644
--- a/templates/email/mail_registration.html
+++ b/templates/email/mail_registration.html
@@ -76,6 +76,9 @@
                       <li><strong>Preis/h</strong>: {{.RentalFee}}</li>
                     </ul>
                   </li>
+                  {{if .Company}}
+                  <li><strong>Firma:</strong> {{.Company}}</li>
+                  {{end}}
                   <li><strong>Name:</strong> {{.FirstName}} {{.LastName}}</li>
                   <li><strong>Mitgliedsnr:</strong> {{.MembershipID}}</li>
                   <li>
diff --git a/templates/email/mail_welcome.html b/templates/email/mail_welcome.html
index d0a284e..c76bcb8 100644
--- a/templates/email/mail_welcome.html
+++ b/templates/email/mail_welcome.html
@@ -31,11 +31,11 @@
             <td>
               <div style="padding: 24px 24px 24px 24px">
                 <a
-                  href="https://marketbase.app"
+                  href="https://carsharing-hasloh.de"
                   style="text-decoration: none"
                   target="_blank"
                   ><img
-                    alt="Marketbase"
+                    alt="Carsharing Hasloh"
                     src="https://carsharing-hasloh.de/images/CarsharingSH-Hasloh-LOGO.jpeg"
                     style="
                       outline: none;
@@ -48,7 +48,7 @@
                 /></a>
               </div>
               <div style="font-weight: normal; padding: 0px 24px 16px 24px">
-                Moin {{.FirstName}} 👋,
+                Moin {{.FirstName}} {{if .Company}}({{.Company}}){{end}}👋,
               </div>
               <div style="font-weight: normal; padding: 0px 24px 16px 24px">
                 wir freuen uns sehr, dich als neues Mitglied bei Carsharing