diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 0040dbc6fc..a4b96354fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -551,6 +551,9 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
                                         rxBus.send(new EventLoopUpdateGui());
                                     }
                                 });
+                            } else {
+                                lastRun.setTbrSetByPump(result);
+                                lastRun.setLastTBRRequest(lastRun.getLastAPSRun());
                             }
                             rxBus.send(new EventLoopUpdateGui());
                         }
diff --git a/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java b/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
index 16c3707536..cb44e77486 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
@@ -170,7 +170,9 @@ public class PumpEnactResult {
                 ret += "<br><b>" + resourceHelper.gs(R.string.absolute) + "</b>: " + DecimalFormatter.to2Decimal(absolute) + " U/h";
             }
         } else {
-            ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment;
+            ret += "<br><b>" + resourceHelper.gs(R.string.success) + "</b>: " + success;
+            if (!comment.isEmpty())
+                ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment;
         }
         return ret;
     }