diff --git a/twitter.lib.php b/twitter.lib.php
index 564978f..1904c79 100644
--- a/twitter.lib.php
+++ b/twitter.lib.php
@@ -13,9 +13,9 @@
 class TwitterConf {
   private static $instance;
   private $attributes = array(
-    'host'     => 'twitter.com',
-    'api'      => 'api.twitter.com',
-    'search'   => 'search.twitter.com',
+    'host'     => 'status.orangeseeds.org',
+    'api'      => 'status.orangeseeds.org/api',
+    'search'   => 'status.orangeseeds.org/search',
     'tiny_url' => 'tinyurl.com',
   );
 
@@ -333,7 +333,7 @@ class Twitter {
       $format = $this->format;
     }
     $conf = TwitterConf::instance();
-    $url =  'http://'. $conf->get('api') .'/1/'. $path;
+    $url =  'http://'. $conf->get('api') . '/' . $path;
     if (!empty($format)) {
       $url .= '.'. $this->format;
     }
diff --git a/twitter.module b/twitter.module
index 04f70b4..7a373cc 100644
--- a/twitter.module
+++ b/twitter.module
@@ -6,9 +6,9 @@
  */
 
 module_load_include('lib.php', 'twitter');
-define ('TWITTER_HOST',         'http://twitter.com');
-define ('TWITTER_API',          'https://api.twitter.com');
-define ('TWITTER_SEARCH',       'http://search.twitter.com');
+define ('TWITTER_HOST',         'http://status.orangeseeds.org');
+define ('TWITTER_API',          'http://status.orangeseeds.org/api');
+define ('TWITTER_SEARCH',       'http://status.orangeseeds.org/search');
 define ('TWITTER_TINYURL',      'http://tinyurl.com');
 
 /**
diff --git a/twitter.pages.inc b/twitter.pages.inc
index d8bf1d0..cee3306 100644
--- a/twitter.pages.inc
+++ b/twitter.pages.inc
@@ -271,7 +271,7 @@ function twitter_account_form($form_state, $account = NULL) {
     '#value' => $account->uid,
   );
 
-  if (_twitter_use_oauth()) {
+  if (_twitter_use_oauth() && FALSE) {
     $form['#validate'] = array('twitter_account_oauth_validate');
   }
   else {