diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
index 585f2985a..85c1fbacb 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
@@ -57,6 +57,7 @@ import org.mifosplatform.portfolio.loanaccount.command.LoanChargeCommand;
 import org.mifosplatform.portfolio.loanaccount.data.LoanCollateralData;
 import org.mifosplatform.portfolio.loanaccount.exception.InvalidLoanStateTransitionException;
 import org.mifosplatform.portfolio.loanaccount.exception.InvalidLoanTransactionTypeException;
+import org.mifosplatform.portfolio.loanaccount.exception.LoanOfficerAssignmentDateException;
 import org.mifosplatform.portfolio.loanaccount.exception.LoanOfficerAssignmentException;
 import org.mifosplatform.portfolio.loanaccount.exception.LoanOfficerUnassignmentDateException;
 import org.mifosplatform.portfolio.loanaccount.loanschedule.data.LoanScheduleData;
@@ -1970,14 +1971,31 @@ public class Loan extends AbstractPersistable<Long> {
     public void reassignLoanOfficer(final Staff newLoanOfficer, final LocalDate assignmentDate) {
 
         final LoanOfficerAssignmentHistory latestHistoryRecord = findLatestIncompleteHistoryRecord();
+        final LoanOfficerAssignmentHistory  lastAssignmentRecordWithNoEndDate = findLastAssignmentHistoryRecord();
 
-        if (latestHistoryRecord != null && this.loanOfficer.identifiedBy(newLoanOfficer)) {
+      //assignment date should not be less than loan submitted date
+        if (getSubmittedOnDate().isAfter(assignmentDate)) {
+            final String errorMessage = "The Loan Officer assignment date (" + assignmentDate.toString() + ") cannot be before loan submitted date (" + getSubmittedOnDate().toString() + ").";
+            throw new LoanOfficerAssignmentDateException("cannot.be.before.loan.submittal.date", errorMessage, assignmentDate, getSubmittedOnDate());
+
+          //assignment date should not be less than latest unassignment date
+        } else if (lastAssignmentRecordWithNoEndDate != null && lastAssignmentRecordWithNoEndDate.getEndDate() != null
+                && lastAssignmentRecordWithNoEndDate.getEndDate().isAfter(assignmentDate)) {
+            final String errorMessage = "The Loan Officer assignment date (" + assignmentDate + ") cannot be before previous Loan Officer unassigned date (" + lastAssignmentRecordWithNoEndDate.getEndDate() + ").";
+            throw new LoanOfficerAssignmentDateException("cannot.be.before.previous.unassignement.date", errorMessage, assignmentDate, lastAssignmentRecordWithNoEndDate.getEndDate());
+
+         //assignment date should not be in the future
+        } else if (DateUtils.getLocalDateOfTenant().isBefore(assignmentDate)) {
+            final String errorMessage = "The Loan Officer assignment date (" + assignmentDate + ") cannot be in the future.";
+            throw new LoanOfficerAssignmentDateException("cannot.be.a.future.date", errorMessage, assignmentDate);
+        }else if (latestHistoryRecord != null && this.loanOfficer.identifiedBy(newLoanOfficer)) {
             latestHistoryRecord.updateStartDate(assignmentDate);
         } else if (latestHistoryRecord != null && latestHistoryRecord.matchesStartDateOf(assignmentDate)) {
             latestHistoryRecord.updateLoanOfficer(newLoanOfficer);
             this.loanOfficer = newLoanOfficer;
         } else if (latestHistoryRecord != null && latestHistoryRecord.hasStartDateBefore(assignmentDate)) {
-            throw new LoanOfficerAssignmentException(this.getId(), assignmentDate);
+            final String errorMessage = "Loan with identifier " + this.getId() + " was already assigned before date " + assignmentDate;
+            throw new LoanOfficerAssignmentDateException("is.before.last.assignment.date", errorMessage, this.getId(), assignmentDate);
         } else {
             if (latestHistoryRecord != null) {
                 // loan officer correctly changed from previous loan officer to
@@ -2022,11 +2040,30 @@ public class Loan extends AbstractPersistable<Long> {
         for (LoanOfficerAssignmentHistory historyRecord : this.loanOfficerHistory) {
             if (historyRecord.isCurrentRecord()) {
                 latestRecordWithNoEndDate = historyRecord;
+                break;
             }
         }
         return latestRecordWithNoEndDate;
     }
 
+    private LoanOfficerAssignmentHistory findLastAssignmentHistoryRecord() {
+
+        LoanOfficerAssignmentHistory lastAssignmentRecordWithNoEndDate = null;
+        for (LoanOfficerAssignmentHistory historyRecord : this.loanOfficerHistory) {
+            if (historyRecord.isCurrentRecord()) {
+                lastAssignmentRecordWithNoEndDate = historyRecord;
+                break;
+            }
+
+            if(lastAssignmentRecordWithNoEndDate == null){
+                lastAssignmentRecordWithNoEndDate = historyRecord;
+            } else if(historyRecord.getEndDate().isAfter(lastAssignmentRecordWithNoEndDate.getEndDate())){
+                lastAssignmentRecordWithNoEndDate = historyRecord;
+            }
+        }
+        return lastAssignmentRecordWithNoEndDate;
+    }
+
     public Long getClientId() {
         Long clientId = null;
         if (this.client != null) {
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanOfficerAssignmentHistory.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanOfficerAssignmentHistory.java
index 58beda02b..83d7d0a25 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanOfficerAssignmentHistory.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanOfficerAssignmentHistory.java
@@ -83,4 +83,8 @@ public class LoanOfficerAssignmentHistory extends AbstractAuditableCustom<AppUse
 	public boolean isCurrentRecord() {
 		return this.endDate == null;
 	}
+
+	public LocalDate getEndDate() {
+            return new LocalDate(endDate);
+    }
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/exception/LoanOfficerAssignmentDateException.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/exception/LoanOfficerAssignmentDateException.java
new file mode 100644
index 000000000..4424cb412
--- /dev/null
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/exception/LoanOfficerAssignmentDateException.java
@@ -0,0 +1,17 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.mifosplatform.portfolio.loanaccount.exception;
+
+import org.mifosplatform.infrastructure.core.exception.AbstractPlatformDomainRuleException;
+
+public class LoanOfficerAssignmentDateException extends AbstractPlatformDomainRuleException {
+
+    public LoanOfficerAssignmentDateException(String postFix, String defaultUserMessage,
+            Object... defaultUserMessageArgs) {
+        super("error.msg.loan.assignment.date." + postFix, defaultUserMessage, defaultUserMessageArgs);
+    }
+
+}