diff --git a/firebase/src/firebase_ios.mm b/firebase/src/firebase_ios.mm
index 5f242b3..8017203 100644
--- a/firebase/src/firebase_ios.mm
+++ b/firebase/src/firebase_ios.mm
@@ -86,8 +86,13 @@ bool SetOption(const char* key, const char* value) {
     void Initialize() {
         @try {
             if(![FIRApp defaultApp]) {
-                // TODO: options
-                [FIRApp configure];
+                if (!firOptions) {
+                    [FIRApp configure];
+                }
+                else {
+                    [FIRApp configureWithOptions:firOptions];
+                    firOptions = 0;
+                }
             }
             SendSimpleMessage(MSG_INITIALIZED);
         } @catch (NSException* e) {
@@ -102,7 +107,7 @@ void GetInstallationAuthToken() {
                 if (error != nil) {
                     SendErrorMessage(error);
                 } else {
-                    SendSimpleMessage(MSG_INSTALLATION_AUTH_TOKEN, @"id", [result authToken]);
+                    SendSimpleMessage(MSG_INSTALLATION_AUTH_TOKEN, @"token", [result authToken]);
                 }
             }];
         } @catch (NSException* e) {