diff --git a/backend/.env.dist b/backend/.env.dist
index 447608533..0a95eda6c 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -41,7 +41,7 @@ EMAIL_PASSWORD=xxx
 EMAIL_SMTP_URL=gmail.com
 EMAIL_SMTP_PORT=587
 EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{optin}{code}
-EMAIL_LINK_SETPASSWORD=http://localhost/reset/{code}
+EMAIL_LINK_SETPASSWORD=http://localhost/reset/{optin}
 EMAIL_LINK_FORGOTPASSWORD=http://localhost/forgot-password
 EMAIL_CODE_VALID_TIME=1440
 EMAIL_CODE_REQUEST_TIME=10
diff --git a/backend/.env.template b/backend/.env.template
index 454b25d3c..66cac7a7c 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -33,7 +33,6 @@ LOGIN_APP_SECRET=21ffbbc616fe
 LOGIN_SERVER_KEY=a51ef8ac7ef1abf162fb7a65261acd7a
 
 # EMail
-RESEND_TIME=10
 EMAIL=$EMAIL
 EMAIL_USERNAME=$EMAIL_USERNAME
 EMAIL_SENDER=$EMAIL_SENDER
@@ -42,7 +41,8 @@ EMAIL_SMTP_URL=$EMAIL_SMTP_URL
 EMAIL_SMTP_PORT=587
 EMAIL_LINK_VERIFICATION=$EMAIL_LINK_VERIFICATION
 EMAIL_LINK_SETPASSWORD=$EMAIL_LINK_SETPASSWORD
-RESEND_TIME=10
+EMAIL_CODE_VALID_TIME=$EMAIL_CODE_VALID_TIME
+EMAIL_CODE_REQUEST_TIME=$EMAIL_CODE_REQUEST_TIME
 
 # Webhook
 WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET
\ No newline at end of file
diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index e46ee1d90..f2b0bcbb3 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -25,8 +25,11 @@ EMAIL_USERNAME=peter@lustig.de
 EMAIL_SENDER=peter@lustig.de
 EMAIL_PASSWORD=1234
 EMAIL_SMTP_URL=smtp.lustig.de
-EMAIL_LINK_VERIFICATION=https://stage1.gradido.net/checkEmail/{code}
-EMAIL_LINK_SETPASSWORD=https://stage1.gradido.net/reset/{code}
+EMAIL_LINK_VERIFICATION=https://stage1.gradido.net/checkEmail/{optin}{code}
+EMAIL_LINK_SETPASSWORD=https://stage1.gradido.net/reset/{optin}
+EMAIL_LINK_FORGOTPASSWORD=https://stage1.gradido.net/forgot-password
+EMAIL_CODE_VALID_TIME=1440
+EMAIL_CODE_REQUEST_TIME=10
 
 TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log
 
@@ -54,6 +57,8 @@ FRONTEND_CONFIG_VERSION=v1.2022-03-18
 GRAPHQL_URI=https://stage1.gradido.net/graphql
 ADMIN_AUTH_URL=https://stage1.gradido.net/admin/authenticate?token={token}
 
+DEFAULT_PUBLISHER_ID=2896
+
 META_URL=http://localhost
 META_TITLE_DE="Gradido – Dein Dankbarkeitskonto"
 META_TITLE_EN="Gradido - Your gratitude account"
diff --git a/frontend/.env.template b/frontend/.env.template
index 4e4a86d08..10c42daa9 100644
--- a/frontend/.env.template
+++ b/frontend/.env.template
@@ -9,5 +9,5 @@ META_KEYWORDS_DE=$META_KEYWORDS_DE
 META_KEYWORDS_EN=$META_KEYWORDS_EN
 META_AUTHOR=$META_AUTHOR
 GRAPHQL_URI=$GRAPHQL_URI
-DEFAULT_PUBLISHER_ID=2896
+DEFAULT_PUBLISHER_ID=$DEFAULT_PUBLISHER_ID
 ADMIN_AUTH_URL=$ADMIN_AUTH_URL
\ No newline at end of file
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index ded1cceb7..97340117d 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -13,6 +13,6 @@ const amount = (value) => {
 const GDD = (value) => {
   value = amount(value)
   if (value === '') return ''
-  if (!value.match(/^− /)) value = '+ ' + value
+  if (!value.match(/^− /) && !value.match(/^0[.,]00$/)) value = '+ ' + value
   return value + ' GDD'
 }