diff --git a/nest/config.Y b/nest/config.Y
index c13a6aec..b0634a62 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -146,15 +146,16 @@ password_begin:
 
 password_items:
    /* empty */ { } 
- | FROM datetime ';' password_items { last_password_item->from = $2; }
- | TO datetime ';' password_items { last_password_item->to = $2; }
- | ID NUM ';' password_items { last_password_item->id = $2; }
+ | FROM datetime password_items { last_password_item->from = $2; }
+ | TO datetime password_items { last_password_item->to = $2; }
+ | ID NUM password_items { last_password_item->id = $2; }
  ;
 
 password_list: 
    /* empty */ { $$ = NULL; } 
- | '{' password_begin ';' password_items '}' password_list {
-     last_password_item->next = $6;
+ | password_begin password_items ';' password_list {
+     last_password_item->next = $4;
+     $$ = last_password_item;
    }
  ;
 
diff --git a/nest/password.h b/nest/password.h
index db2a8bff..b457495a 100644
--- a/nest/password.h
+++ b/nest/password.h
@@ -6,6 +6,8 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
+#ifndef PASSWORD_H
+#define PASSWORD_H
 struct password_item {
   struct password_item *next;
   char *password;
@@ -14,3 +16,4 @@ struct password_item {
 };
 
 extern struct password_item *last_password_item;
+#endif