diff --git a/onebusaway-webapp/src/main/java/org/onebusaway/webapp/actions/admin/problems/TripProblemReportsAction.java b/onebusaway-webapp/src/main/java/org/onebusaway/webapp/actions/admin/problems/TripProblemReportsAction.java
index 7b160eb12..ff29af204 100644
--- a/onebusaway-webapp/src/main/java/org/onebusaway/webapp/actions/admin/problems/TripProblemReportsAction.java
+++ b/onebusaway-webapp/src/main/java/org/onebusaway/webapp/actions/admin/problems/TripProblemReportsAction.java
@@ -111,7 +111,7 @@ public String edit() {
 
     TripBean trip = _model.getTrip();
 
-    if (_model.getVehicleId() != null) {
+    if (_model.getVehicleId() != null || (_model.getTrip() != null && _model.getServiceDate() > 0)) {
       VehicleLocationRecordQueryBean query = new VehicleLocationRecordQueryBean();
       query.setServiceDate(_model.getServiceDate());
       if (trip != null)
diff --git a/onebusaway-webapp/src/main/webapp/WEB-INF/content/admin/problems/trip-problem-reports-edit.jspx b/onebusaway-webapp/src/main/webapp/WEB-INF/content/admin/problems/trip-problem-reports-edit.jspx
index 4d4d7f1a3..7ba2f0058 100644
--- a/onebusaway-webapp/src/main/webapp/WEB-INF/content/admin/problems/trip-problem-reports-edit.jspx
+++ b/onebusaway-webapp/src/main/webapp/WEB-INF/content/admin/problems/trip-problem-reports-edit.jspx
@@ -118,7 +118,12 @@
     </tr>
     <tr>
         <td>Predicted:</td>
-        <td><s:property value="predicted" /></td>
+        <jsp:element name="td">
+          <jsp:attribute name="class">
+            <s:if test="! vehicleLocationRecords.empty and ! predicted">warning</s:if>
+          </jsp:attribute>
+          <s:property value="predicted" />
+        </jsp:element>
     </tr>
     <tr>
         <td>Schedule Deviation:</td>
@@ -201,6 +206,9 @@ jQuery("input#trip-problem-reports_label").autocomplete({
                 <td class="time">Time</td>
                 <td class="scheduleDeviation">Schedule Deviation</td>
                 <td class="location">Location</td>
+                <s:if test="! predicted">
+                  <td class="vehicle">Vehicle Id</td>
+                </s:if>
             </tr>
         </thead>
         <tbody>
@@ -217,6 +225,9 @@ jQuery("input#trip-problem-reports_label").autocomplete({
                       <s:property value="currentLocation.lat"/><jsp:text> </jsp:text><s:property value="currentLocation.lon"/>
                     </s:if>
                     </td>
+                    <s:if test="! predicted">
+                      <td><s:property value="vehicleId"/></td>
+                    </s:if>
                 </tr>
             </s:iterator>
         </tbody>
diff --git a/onebusaway-webapp/src/main/webapp/WEB-INF/css/admin.css b/onebusaway-webapp/src/main/webapp/WEB-INF/css/admin.css
index e23823f69..928896927 100644
--- a/onebusaway-webapp/src/main/webapp/WEB-INF/css/admin.css
+++ b/onebusaway-webapp/src/main/webapp/WEB-INF/css/admin.css
@@ -80,6 +80,11 @@ table#mapLegend td:first-child {
 	text-align: right;	
 }
 
+#tripProblemReportTable td.warning {
+	font-weight: bold;
+	color: red;
+}
+
 #vehicleLocationRecords {
   margin-top: 1em;	
 }