diff --git a/lib/client.js b/lib/client.js
index 6fa441f1f..2fe555382 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -1749,27 +1749,25 @@ MatrixClient.prototype.loginWithSAML2 = function(relayState, callback) {
 };
 
 /**
- * @param {module:client.callback} callback Optional.
- * @return {module:client.Promise} Resolves: TODO
- * @return {module:http-api.MatrixError} Rejects: with an error response.
+ * @param {string} redirectUrl The URL to redirect to after the HS 
+ * authenticates with CAS.
+ * @return {string} The HS URL to hit to begin the CAS login process.
  */
-MatrixClient.prototype.getCasServer = function(callback) {
-    return this._http.request(
-        callback, "GET", "/login/cas", undefined, undefined
-    );
+MatrixClient.prototype.getCasLoginUrl = function(redirectUrl) {
+    return this._http.getUrl("/login/cas/redirect", {
+        "redirectUrl": redirectUrl
+    }, httpApi.PREFIX_V1);
 };
 
 /**
- * @param {string} ticket (Received from CAS)
- * @param {string} service Service to which the token was granted
+ * @param {string} token Login token previously received from homeserver
  * @param {module:client.callback} callback Optional.
  * @return {module:client.Promise} Resolves: TODO
  * @return {module:http-api.MatrixError} Rejects: with an error response.
  */
-MatrixClient.prototype.loginWithCas = function(ticket, service, callback) {
-    return this.login("m.login.cas", {
-        ticket: ticket,
-        service: service
+MatrixClient.prototype.loginWithToken = function(token, callback) {
+    return this.login("m.login.token", {
+        token: token
     }, callback);
 };
 
diff --git a/lib/http-api.js b/lib/http-api.js
index 09b3d4d38..797daa426 100644
--- a/lib/http-api.js
+++ b/lib/http-api.js
@@ -296,6 +296,25 @@ module.exports.MatrixHttpApi.prototype = {
         return this._request(callback, method, fullUri, queryParams, data);
     },
 
+    /**
+     * Form and return a homeserver request URL based on the given path
+     * params and prefix.
+     * @param {string} path The HTTP path <b>after</b> the supplied prefix e.g.
+     * "/createRoom".
+     * @param {Object} queryParams A dict of query params (these will NOT be
+     * urlencoded).
+     * @param {string} prefix The full prefix to use e.g.
+     * "/_matrix/client/v2_alpha".
+     * @return {string} URL
+     */
+    getUrl: function(path, queryParams, prefix) {
+        var queryString = "";
+        if (queryParams) {
+            queryString = "?" + utils.encodeParams(queryParams);
+        }
+        return this.opts.baseUrl + prefix + path + queryString;
+    },
+
     _request: function(callback, method, uri, queryParams, data) {
         if (callback !== undefined && !utils.isFunction(callback)) {
             throw Error(