diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java
index 9017856dd5..2f122a184f 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java
@@ -121,16 +121,12 @@ public class CalloutGLJournal extends CalloutEngine
 				rs = pstmt.executeQuery();
 				if (rs.next())
 				{
-					String PeriodType = rs.getString(1);
 					Timestamp StartDate = rs.getTimestamp(2);
 					Timestamp EndDate = rs.getTimestamp(3);
-					if (PeriodType.equals("S")) //  Standard Periods
-					{
-						//  out of range - set to last day
-						if (DateAcct == null
-							|| DateAcct.before(StartDate) || DateAcct.after(EndDate))
-							mTab.setValue("DateAcct", EndDate);
-					}
+					//  out of range - set to last day
+					if (DateAcct == null
+						|| DateAcct.before(StartDate) || DateAcct.after(EndDate))
+						mTab.setValue("DateAcct", EndDate);
 				}
 			}
 			catch (SQLException e)
diff --git a/org.adempiere.base/src/org/compiere/model/MJournal.java b/org.adempiere.base/src/org/compiere/model/MJournal.java
index d4b4cf1c1c..ff03adbb49 100644
--- a/org.adempiere.base/src/org/compiere/model/MJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/MJournal.java
@@ -322,7 +322,10 @@ public class MJournal extends X_GL_Journal implements DocAction
 			}
 			else if (C_Period_ID != getC_Period_ID())
 			{
-				setC_Period_ID(C_Period_ID);
+				/* special case when assigning an adjustment period */
+				MPeriod currentPeriod = MPeriod.get(getCtx(), getC_Period_ID());
+				if (currentPeriod.isStandardPeriod())
+					setC_Period_ID(C_Period_ID);
 			}
 		}
 
diff --git a/org.adempiere.base/src/org/compiere/model/MJournalBatch.java b/org.adempiere.base/src/org/compiere/model/MJournalBatch.java
index 89f852f1d4..1b1d049bd5 100644
--- a/org.adempiere.base/src/org/compiere/model/MJournalBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/MJournalBatch.java
@@ -954,7 +954,10 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
 			}
 			else if (C_Period_ID != getC_Period_ID())
 			{
-				setC_Period_ID(C_Period_ID);
+				/* special case when assigning an adjustment period */
+				MPeriod currentPeriod = MPeriod.get(getCtx(), getC_Period_ID());
+				if (currentPeriod.isStandardPeriod())
+					setC_Period_ID(C_Period_ID);
 			}
 		}