Merge branch 'felix-work'

diff --combined src/org/cacert/gigi/dbObjects/User.java
index c453465b505c36c460626c3ff149b83202225463,412f02ca601f42b6e29b2a0fbcc0425a4548d041..6363757eaafa55ec51faf049d81f4c85700ae282
--- 1/src/org/cacert/gigi/dbObjects/User.java
--- 2/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@@ -141,9 -141,7 +141,7 @@@ public class User extends CertificateOw
          ps = DatabaseConnection.getInstance().prepare("UPDATE users SET `password`=? WHERE id=?");
          ps.setString(1, PasswordHash.hash(newPass));
          ps.setInt(2, getId());
-         if (ps.executeUpdate() != 1) {
-             throw new GigiApiException("Password update failed.");
-         }
+         ps.executeUpdate();
      }
  
      public void setName(Name name) {
@@@ -455,6 -453,7 +453,6 @@@
          GigiResultSet rs = ps.executeQuery();
          while (rs.next()) {
              results.add(User.getById(rs.getInt(1)));
 -            System.out.println("Found user");
          }
          return results.toArray(new User[results.size()]);
      }
@@@ -469,7 -468,7 +467,7 @@@
              return getAssurancePoints() > 50 && isInGroup(Group.getByString("codesigning"));
          case 3:
          case 4:
-             return false; // has an orga
+             return getOrganisations().size() > 0;
          default:
              return false;
          }