Index: /WAeUP_SRP/trunk/profiles/default/actionicons.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/actionicons.xml	(revision 1473)
+++ /WAeUP_SRP/trunk/profiles/default/actionicons.xml	(revision 1474)
@@ -278,4 +278,7 @@
               title="Request Transfer" priority="6"
               icon_expr="arrow_switch.png"/>
+ <action-icon category="student" action_id="change_password"
+              title="Change Password" priority="7"
+              icon_expr="actionicon_user_preferences.png"/>              
 
  <action-icon category="global" action_id="members"
Index: /WAeUP_SRP/trunk/profiles/default/actions.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/actions.xml	(revision 1473)
+++ /WAeUP_SRP/trunk/profiles/default/actions.xml	(revision 1474)
@@ -175,5 +175,9 @@
    <permission>View</permission>
   </action>
-
+  <action title="Change Password" action_id="change_password"
+     category="student" condition_expr="member"
+     url_expr="string:${portal_url}/change_password" visible="True">
+   <permission>View</permission>
+  </action>
   <action title="Home" action_id="students_home" category="student_navigation"
      condition_expr="not:member" url_expr="string:${portal_url}" visible="True">
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_change_password.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_change_password.xml	(revision 1473)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_change_password.xml	(revision 1474)
@@ -21,5 +21,6 @@
     <property name="password_widget"></property>
     <property name="check_digit">False</property>
-    <property name="size_min">6</property>
+    <property name="size_min">3</property>
+    <property name="size_max">10</property>
   </widget>
   <widget name="password" meta_type="Password Widget">
@@ -36,4 +37,5 @@
     <property name="check_digit">False</property>
     <property name="size_min">6</property>
+    <property name="size_max">10</property>
   </widget>
   <widget name="repeat_password" meta_type="Password Widget">
@@ -51,4 +53,5 @@
     <property name="check_digit">True</property>
     <property name="size_min">6</property>
+    <property name="size_max">10</property>
   </widget>
   <table>
Index: /WAeUP_SRP/trunk/skins/waeup_student/change_password.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/change_password.py	(revision 1473)
+++ /WAeUP_SRP/trunk/skins/waeup_student/change_password.py	(revision 1474)
@@ -12,5 +12,5 @@
     def set_trace():
         pass
-    
+
 current = DateTime.DateTime()
 #pr = context.portal_registration
Index: /WAeUP_SRP/trunk/skins/waeup_student/getAccommodationInfo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/getAccommodationInfo.py	(revision 1473)
+++ /WAeUP_SRP/trunk/skins/waeup_student/getAccommodationInfo.py	(revision 1474)
@@ -64,5 +64,6 @@
 info['email']=s_brain.email
 info['level']=s_brain.level
-info['verdict']=s_brain.verdict
+info['verdict']=getattr(s_brain,"verdict","N/A")
+
 
 students_object = context.portal_url.getPortalObject().campus.students
