diff --git a/src/main/java/org/paymentsds/mpesa/Request.java b/src/main/java/org/paymentsds/mpesa/Request.java
index eab5ff2..12344f1 100644
--- a/src/main/java/org/paymentsds/mpesa/Request.java
+++ b/src/main/java/org/paymentsds/mpesa/Request.java
@@ -72,7 +72,11 @@ public Builder amount(double amount) {
         }
 
         public Builder from(String from) {
-            this.from = from;
+            if (from.length() == 9) {
+                this.from = 258 + from;
+            } else {
+                this.from = from;
+            }
             return this;
         }
 
@@ -87,7 +91,11 @@ public Builder transaction(String transaction) {
         }
 
         public Builder to(String to) {
-            this.to = to;
+            if (to.length() == 9) {
+                this.to = 258 + to;
+            } else {
+                this.to = to;
+            }
             return this;
         }