diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
index a6ec49d3b..fbc79d39e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
@@ -435,8 +435,14 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
             return;
         }
 
-        if(taskRabbitTask.getTaskID() > 0)
-            taskButton.setText("Update task!");
+        if(taskRabbitTask.getTaskID() > 0) {
+            taskButton.setText("Already Posted!");
+            taskButton.setEnabled(false);
+        }
+        else {
+            taskButton.setEnabled(true);
+        }
+
         JSONObject jsonData = container.getLocalTaskData();
         synchronized (controls) {
             if(jsonData != null) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
index 131fa1b5e..aed5c2b08 100644
--- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
@@ -218,11 +218,11 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
     public boolean activityResult (int requestCode, int resultCode, Intent data) {
         if (requestCode == REQUEST_CODE_TASK_RABBIT_ACTIVITY && resultCode == Activity.RESULT_OK){
             String result = data.getStringExtra(OAuthLoginActivity.DATA_RESPONSE);
-            if (TextUtils.isEmpty(result)) {
+            if (!TextUtils.isEmpty(result)) {
                 try {
                     Message successMessage = new Message();
                     successMessage.what = 1;
-                    handler.sendMessageDelayed(successMessage, 1500);
+                    handler.sendMessageDelayed(successMessage, 500);
                 }
                 catch (Exception e){
                     e.printStackTrace();