diff --git a/src/com/android/nfc/NfcWifiProtectedSetup.java b/src/com/android/nfc/NfcWifiProtectedSetup.java
index 0b425d1..dbd22b7 100644
--- a/src/com/android/nfc/NfcWifiProtectedSetup.java
+++ b/src/com/android/nfc/NfcWifiProtectedSetup.java
@@ -125,7 +125,7 @@
                 case SSID_FIELD_ID:
                     byte[] ssid = new byte[fieldSize];
                     payload.get(ssid);
-                    result.SSID = new String(ssid);
+                    result.SSID = "\"" + new String(ssid) + "\"";
                     break;
                 case NETWORK_KEY_FIELD_ID:
                     if (fieldSize > MAX_NETWORK_KEY_SIZE_BYTES) {
@@ -133,7 +133,7 @@
                     }
                     byte[] networkKey = new byte[fieldSize];
                     payload.get(networkKey);
-                    result.preSharedKey = new String(networkKey);
+                    result.preSharedKey = "\"" + new String(networkKey) + "\"";
                     break;
                 case AUTH_TYPE_FIELD_ID:
                     if (fieldSize != AUTH_TYPE_EXPECTED_SIZE) {