diff --git a/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Extensions.php b/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Extensions.php
index f72441e..70c25f5 100644
--- a/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Extensions.php
+++ b/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Extensions.php
@@ -2,8 +2,8 @@
/**
* @category German
* @package German_LocalePack
- * @authors MaWoScha
- * @developer MaWoScha
+ * @authors MaWoScha
+ * @developer MaWoScha
* @version 0.1.0
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Instructions.php b/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Instructions.php
index a3011e9..e5418c9 100644
--- a/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Instructions.php
+++ b/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Instructions.php
@@ -2,8 +2,8 @@
/**
* @category German
* @package German_LocalePack
- * @authors MaWoScha
- * @developer MaWoScha
+ * @authors MaWoScha
+ * @developer MaWoScha
* @version 0.4.4
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Magentoconnectmanager.php b/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Magentoconnectmanager.php
index af3fb63..4aa1013 100644
--- a/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Magentoconnectmanager.php
+++ b/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Magentoconnectmanager.php
@@ -2,8 +2,8 @@
/**
* @category German
* @package German_LocalePack
- * @authors MaWoScha
- * @developer MaWoScha
+ * @authors MaWoScha
+ * @developer MaWoScha
* @version 0.2.0
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/community/German/LocalePackDe/Helper/Data.php b/app/code/community/German/LocalePackDe/Helper/Data.php
index 9ec6ece..8016e76 100644
--- a/app/code/community/German/LocalePackDe/Helper/Data.php
+++ b/app/code/community/German/LocalePackDe/Helper/Data.php
@@ -2,8 +2,8 @@
/**
* @category German
* @package German_LocalePack
- * @authors MaWoScha , Rico Neitzel
- * @developer MaWoScha , Rico Neitzel
+ * @authors MaWoScha, Rico Neitzel
+ * @developer MaWoScha, Rico Neitzel
* @version 0.1.0
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/community/German/LocalePackDe/Model/Observer.php b/app/code/community/German/LocalePackDe/Model/Observer.php
index 5e7a7b6..5a8b35e 100644
--- a/app/code/community/German/LocalePackDe/Model/Observer.php
+++ b/app/code/community/German/LocalePackDe/Model/Observer.php
@@ -2,8 +2,8 @@
/**
* @category German
* @package German_LocalePack
- * @authors MaWoScha , Rico Neitzel
- * @developer MaWoScha , Rico Neitzel
+ * @authors MaWoScha, Rico Neitzel
+ * @developer MaWoScha, Rico Neitzel
* @version 0.1.0
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/community/German/LocalePackDe/etc/config.xml b/app/code/community/German/LocalePackDe/etc/config.xml
index 9674197..8535dee 100644
--- a/app/code/community/German/LocalePackDe/etc/config.xml
+++ b/app/code/community/German/LocalePackDe/etc/config.xml
@@ -3,8 +3,8 @@
/**
* @category German
* @package German_LocalePack
- * @authors MaWoScha , Rico Neitzel
- * @developer MaWoScha , Rico Neitzel
+ * @authors MaWoScha, Rico Neitzel
+ * @developer MaWoScha, Rico Neitzel
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-->
diff --git a/app/code/community/German/LocalePackDe/etc/system.xml b/app/code/community/German/LocalePackDe/etc/system.xml
index facb9c6..fe0701d 100644
--- a/app/code/community/German/LocalePackDe/etc/system.xml
+++ b/app/code/community/German/LocalePackDe/etc/system.xml
@@ -3,8 +3,8 @@
/**
* @category German
* @package German_LocalePack
- * @authors MaWoScha , Rico Neitzel
- * @developer MaWoScha , Rico Neitzel
+ * @authors MaWoScha, Rico Neitzel
+ * @developer MaWoScha, Rico Neitzel
* @version 0.3.0
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/community/German/LocalePackDe/sql/localepackde_setup/mysql4-install-0.3.9.php b/app/code/community/German/LocalePackDe/sql/localepackde_setup/mysql4-install-0.3.9.php
index 3d9395a..7db21e1 100644
--- a/app/code/community/German/LocalePackDe/sql/localepackde_setup/mysql4-install-0.3.9.php
+++ b/app/code/community/German/LocalePackDe/sql/localepackde_setup/mysql4-install-0.3.9.php
@@ -2,8 +2,8 @@
/**
* @category German
* @package German_LocalePack
- * @authors MaWoScha
- * @developer MaWoScha
+ * @authors MaWoScha
+ * @developer MaWoScha
* @version 0.3.9
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/design/adminhtml/default/default/layout/localepackde.xml b/app/design/adminhtml/default/default/layout/localepackde.xml
index 28be089..7531a65 100644
--- a/app/design/adminhtml/default/default/layout/localepackde.xml
+++ b/app/design/adminhtml/default/default/layout/localepackde.xml
@@ -3,8 +3,8 @@
/**
* @category German
* @package German_LocalePack
- * @authors MaWoScha , Rico Neitzel
- * @developer MaWoScha , Rico Neitzel
+ * @authors MaWoScha, Rico Neitzel
+ * @developer MaWoScha, Rico Neitzel
* @version 0.3.0
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/etc/modules/German_LocalePackDe.xml b/app/etc/modules/German_LocalePackDe.xml
index e911fdf..4b5bdb4 100644
--- a/app/etc/modules/German_LocalePackDe.xml
+++ b/app/etc/modules/German_LocalePackDe.xml
@@ -3,8 +3,8 @@
/**
* @category German
* @package German_LocalePack
- * @authors MaWoScha , Rico Neitzel
- * @developer MaWoScha , Rico Neitzel
+ * @authors MaWoScha, Rico Neitzel
+ * @developer MaWoScha, Rico Neitzel
* @version 0.1.0
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/locale/de_DE/template/email/account_password_reset_confirmation.html b/app/locale/de_DE/template/email/account_password_reset_confirmation.html
index 59da348..7688c12 100644
--- a/app/locale/de_DE/template/email/account_password_reset_confirmation.html
+++ b/app/locale/de_DE/template/email/account_password_reset_confirmation.html
@@ -4,7 +4,7 @@
"var logo_url":"Email Logo Image Url",
"var logo_alt":"Email Logo Image Alt",
"htmlescape var=$customer.name":"Customer Name",
-"store url=\"customer/account/resetpassword/\" _query_id=$customer.id _query_token=$customer.rp_token":"Reset Password URL"}
+"store url=\"customer/account/resetpassword/\" _query_id=$customer.rp_customer_id _query_token=$customer.rp_token":"Reset Password URL"}
@-->