diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/lib/persistentkeyvaluestore-source/PersistentKeyValueStore.java b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/lib/persistentkeyvaluestore-source/PersistentKeyValueStore.java
index cbbd3a4b2f7af536cd202d4f099ab8a967cc84e7..48bc86698b0c6a8f4c733a713bf4f341a75caea9 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/lib/persistentkeyvaluestore-source/PersistentKeyValueStore.java
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/lib/persistentkeyvaluestore-source/PersistentKeyValueStore.java
@@ -73,15 +73,15 @@ public class PersistentKeyValueStore {
 
 	@SuppressWarnings("unchecked")
 	private static void load() {
-		try (FileInputStream fis = new FileInputStream(KEY_STORE_FILE)) {
-			if (new File(KEY_STORE_FILE).exists()) {
+		if (new File(KEY_STORE_FILE).exists()) {
+			try (FileInputStream fis = new FileInputStream(KEY_STORE_FILE)) {
 		        ObjectInputStream ois = new ObjectInputStream(fis);
 		        keyStore = (ConcurrentMap<String, Serializable>) ois.readObject();
 		        ois.close();
+			} catch (IOException | ClassNotFoundException e)
+			{
+				e.printStackTrace();
 			}
-		} catch (IOException | ClassNotFoundException e)
-		{
-			e.printStackTrace();
 		}
 	}
 
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/lib/persistentkeyvaluestore.jar b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/lib/persistentkeyvaluestore.jar
index 1f2a896f4205e7371109844e1328390ff6557c8f..4c8804a287c4a05f4c98a11ea54cae28aec062b7 100644
Binary files a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/lib/persistentkeyvaluestore.jar and b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/lib/persistentkeyvaluestore.jar differ
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/password-reset-api.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/password-reset-api.py
index 25067b6783602f4849a6576293c651b2514f247c..677fd7333e88220779f6681eeccfdf8445d7f25f 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/password-reset-api.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/password-reset-api/password-reset-api.py
@@ -43,11 +43,9 @@ def process(tr, parameters, tableBuilder):
 
 
 def sendResetPasswordEmail(tr, userId, baseUrl):
-    print("sendResetPasswordEmail")
     # generate and store token
     token = UUID.randomUUID().toString()
     timestamp = time.time()
-    print("timestamp: " + str(timestamp))
     PersistentKeyValueStore.put(userId + RESET_TOKEN_KEY_POSTFIX, { "token" : token, "timestamp" : timestamp})
     # send email
     emailAddress = getUserEmail(tr, userId)
@@ -70,8 +68,6 @@ def sendMail(tr, email, subject, body):
     fromAddress = None;
     recipient1 = EMailAddress(email);
     tr.getGlobalState().getMailClient().sendEmailMessage(subject, body, replyTo, fromAddress, recipient1);
-    # TODO don't print message - contains password
-    print "--- MAIL ---" + " Recipient: " + email + " Topic: " + subject + " Message: " + body
 
 def getJsonForData(data):
     objectMapper = GenericObjectMapper();
@@ -102,7 +98,7 @@ def sendEmailWithNewPassword(tr, email, userId, newPassword):
     sendMail(tr, email, newPasswordSubject, newPasswordBody)
 
 def getPasswordResetLink(emailAddress, userId, token, baseUrl):
-    return "%s?resetPassword=true&&userId=%s&token=%s" % (baseUrl, userId, token)
+    return "%s?resetPassword=true&userId=%s&token=%s" % (baseUrl, userId, token)
 
 def resetPasswordInternal(tr, email, userId):
     newPassword = getNewPassword()
@@ -128,7 +124,7 @@ def getNewPassword():
 
 def updateUserPassword(userId, password):
     if os.path.isfile(passwdShPath):
-        subprocess.call([path, 'change', userId, '-p', password]) #Changes the user pass, works always
+        subprocess.call([passwdShPath, 'change', userId, '-p', password]) #Changes the user pass, works always
         return True;
     else:
         return False;