diff --git a/base/src/org/compiere/model/MUser.java b/base/src/org/compiere/model/MUser.java
index 4cdc22f102..4cfd8dbe42 100644
--- a/base/src/org/compiere/model/MUser.java
+++ b/base/src/org/compiere/model/MUser.java
@@ -16,12 +16,23 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.mail.internet.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.logging.Level;
 
-import org.compiere.util.*;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.SecureEngine;
 
 /**
  *  User Model