diff --git a/src/main/java/se/su/dsv/scipro/DataInitialiser.java b/src/main/java/se/su/dsv/scipro/DataInitialiser.java
index 966393473c..96e478958f 100644
--- a/src/main/java/se/su/dsv/scipro/DataInitialiser.java
+++ b/src/main/java/se/su/dsv/scipro/DataInitialiser.java
@@ -30,7 +30,7 @@ public class DataInitialiser {
 		createDefaultUsers();
 	}
 	private void createDefaultProjectClasses(){
-		if(projectClassDao.countAll() < 3){
+		if( (projectClassDao.countAll() + projectClassDao.countAllLazyDeleted()) < 3){
 			final ProjectClass masterClass = new ProjectClass(ProjectClass.MASTER,"Master","Master degree thesis project");;
 			final ProjectClass bachelorClass = new ProjectClass(ProjectClass.BACHELOR,"Bachelor","Bachelor degree thesis project");;
 			final ProjectClass unknownClass = new ProjectClass(ProjectClass.UNKNOWN,"Unknown","Project class is unknown or could not be determined");
diff --git a/src/main/java/se/su/dsv/scipro/data/dao/interfaces/ProjectClassDao.java b/src/main/java/se/su/dsv/scipro/data/dao/interfaces/ProjectClassDao.java
index f0bcf31b93..faa174e557 100644
--- a/src/main/java/se/su/dsv/scipro/data/dao/interfaces/ProjectClassDao.java
+++ b/src/main/java/se/su/dsv/scipro/data/dao/interfaces/ProjectClassDao.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import se.su.dsv.scipro.data.dataobjects.ProjectClass;
 
-public interface ProjectClassDao extends Dao<ProjectClass>{
+public interface ProjectClassDao extends LazyDeleteDao<ProjectClass>{
 	
 	ProjectClass getProjectClass(String projectCode);
 	
diff --git a/src/main/java/se/su/dsv/scipro/data/dao/jpa/ProjectClassDaoJPAImp.java b/src/main/java/se/su/dsv/scipro/data/dao/jpa/ProjectClassDaoJPAImp.java
index f0b8bf5c38..565bf83b0e 100644
--- a/src/main/java/se/su/dsv/scipro/data/dao/jpa/ProjectClassDaoJPAImp.java
+++ b/src/main/java/se/su/dsv/scipro/data/dao/jpa/ProjectClassDaoJPAImp.java
@@ -7,10 +7,10 @@ import javax.persistence.NoResultException;
 import javax.persistence.PersistenceException;
 import javax.persistence.TypedQuery;
 
-import org.hibernate.ejb.QueryHints;
 import org.springframework.orm.jpa.JpaCallback;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
+
 import se.su.dsv.scipro.data.dao.interfaces.ProjectClassDao;
 import se.su.dsv.scipro.data.dataobjects.ProjectClass;
 /**