diff --git a/lib/egnyte.rb b/lib/egnyte.rb
index 442cf2d..9c9b6d9 100644
--- a/lib/egnyte.rb
+++ b/lib/egnyte.rb
@@ -20,5 +20,4 @@
 require "egnyte/permission"
 
 module Egnyte
-	EGNYTE_DOMAIN = "egnyte.com"
 end
diff --git a/lib/egnyte/item.rb b/lib/egnyte/item.rb
index 7b90830..dd80923 100644
--- a/lib/egnyte/item.rb
+++ b/lib/egnyte/item.rb
@@ -20,7 +20,7 @@ def fs_path(mode='fs')
     end
 
     def self.fs_path(session, mode='fs')
-      "https://#{session.domain}.#{EGNYTE_DOMAIN}/#{session.api}/v1/#{mode}/"
+      "https://#{session.domain}/#{session.api}/v1/#{mode}/"
     end
 
     def move_or_copy(destination_path, action)
diff --git a/lib/egnyte/link.rb b/lib/egnyte/link.rb
index e31bdc7..fdc097c 100644
--- a/lib/egnyte/link.rb
+++ b/lib/egnyte/link.rb
@@ -102,7 +102,7 @@ def link_path
     end
 
     def self.link_path(session)
-      "https://#{session.domain}.#{EGNYTE_DOMAIN}/#{session.api}/v1/links"
+      "https://#{session.domain}/#{session.api}/v1/links"
     end
 
   end
diff --git a/lib/egnyte/permission.rb b/lib/egnyte/permission.rb
index 9ce23fd..63a570d 100644
--- a/lib/egnyte/permission.rb
+++ b/lib/egnyte/permission.rb
@@ -85,7 +85,7 @@ def self.original_permissions(session, path, params=nil)
     end
 
     def self.permission_path(session)
-      "https://#{session.domain}.#{EGNYTE_DOMAIN}/#{session.api}/v1/perms/folder"
+      "https://#{session.domain}/#{session.api}/v1/perms/folder"
     end
 
     def valid?
diff --git a/lib/egnyte/session.rb b/lib/egnyte/session.rb
index 27416de..8577be7 100644
--- a/lib/egnyte/session.rb
+++ b/lib/egnyte/session.rb
@@ -16,10 +16,16 @@ def initialize(opts, strategy=:implicit, backoff=0.5)
       @api = 'pubapi' # currently we only support the public API.
 
       # the domain of the egnyte account to interact with.
-      raise Egnyte::DomainRequired unless @domain = opts[:domain]
+      raise Egnyte::DomainRequired unless opts_domain = opts[:domain]
+
+      if opts_domain =~ /.*\..*/
+        @domain = opts[:domain]
+      else
+        @domain = "#{opts_domain}.egnyte.com"
+      end
 
       @client = OAuth2::Client.new(opts[:key], nil, {
-        :site => "https://#{@domain}.#{EGNYTE_DOMAIN}",
+        :site => "https://#{@domain}",
         :authorize_url => "/puboauth/token",
         :token_url => "/puboauth/token"
       })
@@ -39,7 +45,7 @@ def initialize(opts, strategy=:implicit, backoff=0.5)
               :password => @password,
               :grant_type => 'password'
             }
-            response = RestClient.post "https://#{@domain}.#{EGNYTE_DOMAIN}/puboauth/token", token_request_params
+            response = RestClient.post "https://#{@domain}/puboauth/token", token_request_params
             token = JSON.parse(response)["access_token"]
             @access_token = OAuth2::AccessToken.new(@client, token)
           else
diff --git a/lib/egnyte/user.rb b/lib/egnyte/user.rb
index d35badf..e5e5dba 100644
--- a/lib/egnyte/user.rb
+++ b/lib/egnyte/user.rb
@@ -191,7 +191,7 @@ def user_path
     end
 
     def self.user_path(session)
-      "https://#{session.domain}.#{EGNYTE_DOMAIN}/#{session.api}/v2/users"
+      "https://#{session.domain}/#{session.api}/v2/users"
     end
 
     def user_permission_path
@@ -199,7 +199,7 @@ def user_permission_path
     end
 
     def self.user_permission_path(session)
-      "https://#{session.domain}.#{EGNYTE_DOMAIN}/#{session.api}/v1/perms/user"
+      "https://#{session.domain}/#{session.api}/v1/perms/user"
     end
 
   end