diff --git a/authentication/source/java/ch/systemsx/cisd/authentication/IAuthenticationService.java b/authentication/source/java/ch/systemsx/cisd/authentication/IAuthenticationService.java
index 780b48595a262b541a92cbb79335f748dcec23ea..85b7eb0d72f866828bcbbf12201fd6899bd750b3 100644
--- a/authentication/source/java/ch/systemsx/cisd/authentication/IAuthenticationService.java
+++ b/authentication/source/java/ch/systemsx/cisd/authentication/IAuthenticationService.java
@@ -27,25 +27,25 @@ public interface IAuthenticationService extends ISelfTestable
 {
 
     /**
-     * Attempts authentication of the application with credentials passed in the constructor and retuns the application
-     * token. Implementations should log what is going on, whether the application could register itself successfully or
-     * not.
+     * Attempts authentication of the application with credentials passed in the constructor and
+     * retuns the application token. Implementations should log what is going on, whether the
+     * application could register itself successfully or not.
      * <p>
      * The returned application token can then be used to authenticate an user (via
-     * {@link #authenticateUser(String, String, String)}) or to retrieve additional details about an user (via
-     * {@link #getPrincipal(String, String)})
+     * {@link #authenticateUser(String, String, String)}) or to retrieve additional details about
+     * an user (via {@link #getPrincipal(String, String)})
      * </p>
      * 
-     * @return the application token if the application has been successfully authenticated, <code>null</code>
-     *         otherwise.
+     * @return the application token if the application has been successfully authenticated,
+     *         <code>null</code> otherwise.
      */
     public String authenticateApplication();
 
     /**
      * Attempts authentication for the given user credentials.
      * <p>
-     * Note that the application must be authenticated (meaning that <var>applicationToken</var> is not
-     * <code>null</code>) to perform this lookup.
+     * Note that the application must be authenticated (meaning that <var>applicationToken</var> is
+     * not <code>null</code>) to perform this lookup.
      * </p>
      * 
      * @return <code>true</code> if the <var>user</var> has been successfully authenticated.
@@ -53,14 +53,15 @@ public interface IAuthenticationService extends ISelfTestable
     public boolean authenticateUser(String applicationToken, String user, String password);
 
     /**
-     * For a given user name returns additional details encapsulated in returned <code>Principal</code>.
+     * For a given user name returns additional details encapsulated in returned
+     * <code>Principal</code>.
      * <p>
-     * Note that the application must be authenticated (meaning that <var>applicationToken</var> is not
-     * <code>null</code>) to perform this lookup.
+     * Note that the application must be authenticated (meaning that <var>applicationToken</var> is
+     * not <code>null</code>) to perform this lookup.
      * </p>
      * 
-     * @return a <code>Principal</code> object if given <var>user</var> could be found, <code>null</code>
-     *         otherwise.
+     * @return a <code>Principal</code> object if given <var>user</var> could be found,
+     *         <code>null</code> otherwise.
      */
     public Principal getPrincipal(String applicationToken, String user);
 }
\ No newline at end of file
diff --git a/authentication/source/java/ch/systemsx/cisd/authentication/file/FileAuthenticationService.java b/authentication/source/java/ch/systemsx/cisd/authentication/file/FileAuthenticationService.java
index 26c7e8dcf4d7f10f221263a28bedb94acb3660ac..cf0c15355da1b1a675fadecf9ffa01c1b0205a1e 100644
--- a/authentication/source/java/ch/systemsx/cisd/authentication/file/FileAuthenticationService.java
+++ b/authentication/source/java/ch/systemsx/cisd/authentication/file/FileAuthenticationService.java
@@ -52,7 +52,7 @@ public class FileAuthenticationService implements IAuthenticationService
             LogFactory.getLogger(LogCategory.OPERATION, FileAuthenticationService.class);
 
     private final PasswordFile passwordFile;
-    
+
     public FileAuthenticationService(final String passwordFileName)
     {
         this.passwordFile = new PasswordFile(new File(passwordFileName));
diff --git a/authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java b/authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java
index 8ae5fda753225a14c0e8d2f2c3bd76ffa432d628..ab7f0323d385ee417d84348c44ea20a9a4fac8f3 100644
--- a/authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java
+++ b/authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java
@@ -72,7 +72,7 @@ final class Parameters
 
     @Option(name = "p", longName = "password", usage = "The password.")
     private String password;
-    
+
     @Option(name = "P", longName = "change-password", usage = "Read the new password from the console,")
     private boolean changePassword;
 
@@ -214,7 +214,7 @@ final class Parameters
     {
         return emailOrNull;
     }
-    
+
     /**
      * Returns <code>true</code>, if the password should be changed.
      * <p>